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 4bcfb9749e0dd3751a3e8b68a9b16da2b225d5cc (commit)
from 1f8e5b31c8af6d397ded0ee96f3bc77a9b447155 (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=4bcfb9749e0dd3751a3e8b68a9b16da2b225d5cc
commit 4bcfb9749e0dd3751a3e8b68a9b16da2b225d5cc
Author: Roland Mas <[email protected]>
Date: Tue Jul 30 18:40:37 2019 +0200
Handle Debian 10 Buster
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index 9eca782..9f1b9c0 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -42,8 +42,20 @@ if [ -e /etc/debian_version ]; then
vsftpd \
fonts-dejavu-core
apt-get -y install mediawiki -t jessie-backports
+ elif grep -q ^9 /etc/debian_version; then
+ apt-get install -y make gettext php5-cli php5-pgsql
php-htmlpurifier php-http php-text-captcha \
+ libapache2-mpm-itk libapache2-mod-svn \
+ libapache2-mod-php5 \
+ apache2 postgresql postgresql-contrib libnss-pgsql2
unscd \
+ cvs subversion viewvc python-pycurl git mercurial bzr
loggerhead xinetd \
+ python-moinmoin libapache2-mod-wsgi python-psycopg2 \
+ unoconv poppler-utils dpkg-dev \
+ libmarkdown-php \
+ vsftpd \
+ fonts-dejavu-core
+ apt-get -y install mediawiki -t jessie-backports
else
- apt-get install -y make gettext php-cli php-pgsql
php-htmlpurifier php-http php-text-captcha php-soap \
+ apt-get install -y make gettext php-cli php-pgsql
php-htmlpurifier php-http php-soap \
libapache2-mpm-itk libapache2-mod-svn \
libapache2-mod-php \
apache2 postgresql postgresql-contrib libnss-pgsql2
unscd \
@@ -53,6 +65,12 @@ if [ -e /etc/debian_version ]; then
libmarkdown-php \
vsftpd \
fonts-dejavu-core mediawiki
+ pushd $(mktemp -d)
+ ptcver=1.0.2-4
+ wget
http://ftp.fr.debian.org/debian/pool/main/p/php-text-captcha/php-text-captcha_${ptcver}_all.deb
+ dpkg -i php-text-captcha_${ptcver}_all.deb
+ rm -f php-text-captcha_${ptcver}_all.deb
+ popd
fi
if ! dpkg-vendor --is Ubuntu; then
apt-get install locales-all #
https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
diff --git a/tests/buildbot/lxc-wrapper b/tests/buildbot/lxc-wrapper
index facb4c6..d41c401 100755
--- a/tests/buildbot/lxc-wrapper
+++ b/tests/buildbot/lxc-wrapper
@@ -144,7 +144,7 @@ case $cmd in
fi
# TODO: write this in VM config (so it can be started manually)?
hwaddr=00:16:3e:$(echo $host | md5sum | cut -c -6 | sed
s/../\&:/g | sed s/:$//)
- lxc-start --name $host.local -s lxc.net.0.hwaddr=$hwaddr -s
lxc.uts.name=$host --daemon
+ lxc-start --name $host.local -s lxc.net.0.hwaddr=$hwaddr -s
lxc.net.0.type=veth -s lxc.net.0.link=br0 -s lxc.uts.name=$host --daemon
;;
# Harshly^WQuickly stop VM
-----------------------------------------------------------------------
Summary of changes:
autoinstall/install-src.sh | 20 +++++++++++++++++++-
tests/buildbot/lxc-wrapper | 2 +-
2 files changed, 20 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
