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, 6.0 has been updated
via 5a9e1c5e70765c97455d0901838d77c68d18c0ad (commit)
via f958a778080ffe683238ece010209bce9575b869 (commit)
via 4f5c2166b2bf13943f526022d0c0e091d69bcd33 (commit)
via 9d1d7cf039b419d46fd381e5ab596d4c4fe395d3 (commit)
from 3b93204937e9a3b5d5bbc2b912248dfe2d331ccc (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=5a9e1c5e70765c97455d0901838d77c68d18c0ad
commit 5a9e1c5e70765c97455d0901838d77c68d18c0ad
Author: Sylvain Beucler <[email protected]>
Date: Tue Sep 1 18:19:26 2015 +0200
testsuite: scmbzr slow start-up work-around
diff --git a/tests/func/50_PluginsScmBzr/bzrTest.php
b/tests/func/50_PluginsScmBzr/bzrTest.php
index 0621acf..d8d5ac9 100644
--- a/tests/func/50_PluginsScmBzr/bzrTest.php
+++ b/tests/func/50_PluginsScmBzr/bzrTest.php
@@ -50,6 +50,9 @@ class ScmBzrTest extends FForge_SeleniumTestCase
// Run the cronjob to create repositories
$this->waitSystasks();
+ // Give some time to WSGI/loggerhead to start-up
+ // (avoids "Service Unavailable" error page)
+ sleep(5);
// Check that the repo is present and Loggerhead shows it (even
if empty)
$this->open(ROOT);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f958a778080ffe683238ece010209bce9575b869
commit f958a778080ffe683238ece010209bce9575b869
Author: Sylvain Beucler <[email protected]>
Date: Tue Sep 1 18:06:25 2015 +0200
testsuite: fix mediawiki rpm backport - hopefully F22 won't get more
breaking updates now
diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index dfea699..37868b7 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -213,6 +213,9 @@ EOF
sed -i -e '/Requires: php-pecl-jsonc/d'
~/rpmbuild/SPECS/mediawiki.spec
# drop new-style php requires
sed -i -e '/Requires: php(/d' ~/rpmbuild/SPECS/mediawiki.spec
+ # drop test-suite
+ sed -i -e '/BuildRequires: /d' ~/rpmbuild/SPECS/mediawiki.spec
+ sed -i -e '/^%check/,/^php phpunit.php/d'
~/rpmbuild/SPECS/mediawiki.spec
rpmbuild -bb ~/rpmbuild/SPECS/mediawiki.spec
yum install -y ~/rpmbuild/RPMS/noarch/mediawiki-[0-9]*.rpm
fi
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=4f5c2166b2bf13943f526022d0c0e091d69bcd33
commit 4f5c2166b2bf13943f526022d0c0e091d69bcd33
Author: Sylvain Beucler <[email protected]>
Date: Tue Sep 1 17:44:38 2015 +0200
Remove old commented instructions for CentOS 6
diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index ebe3b17..dfea699 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -223,32 +223,6 @@ EOF
REMOVEDEPS=$DEPS
backport_rpm_from_fedora php-channel-htmlpurifier
;;
-
- # Note: FusionForge *6.0* currently doesn't officially support Centos 6
- 6)
- yum install mediawiki119
-
- # Notes for recompiling httpd modules for 2.4.10
- # mod_wsgi:
- # DEPS=""
- # REMOVEDEPS=$DEPS
- # rebuild_rpm_from_centos mod_wsgi
- #
- # PHP:
- # # Skip lengthy testsuite: rpmbuild -D'runselftest 0' --rebuild ...
- # if ! rpm -qR php | grep -q 'httpd-mmn = 20120211x8664' ; then
- # if rpm -qi mariadb-libs | grep -q 5\.5\. && ! rpm -qi
mariadb-libs | grep -q 5\.5\.37 ; then
- # yum downgrade -y mariadb-libs
- # fi
- #
- # DEPS="bzip2-devel curl-devel pam-devel libstdc++-devel
libedit-devel libtool-ltdl-devel libzip-devel systemtap-sdt-devel
firebird-devel net-snmp-devel libxslt-devel t1lib-devel libvpx-devel gmp-devel
tokyocabinet-devel libmcrypt-devel libtidy-devel freetds-devel aspell-devel
recode-devel libicu-devel enchant-devel libc-client-devel openldap-devel
unixODBC-devel mariadb-devel-5.5.37 exim"
- # REMOVEDEPS=$DEPS
- # rebuild_rpm_from_centos --source-package php php-common
php-cli php php-pdo php-pgsql php-process php-ldap php-gd
- #
- # if rpm -qi mariadb-libs | grep -q 5\.5\.37 ; then
- # yum upgrade -y mariadb-libs
- # fi
- # fi
esac
# libnss-pgsql: no available package for RHEL; though it's available in
Fedora
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=9d1d7cf039b419d46fd381e5ab596d4c4fe395d3
commit 9d1d7cf039b419d46fd381e5ab596d4c4fe395d3
Author: Sylvain Beucler <[email protected]>
Date: Tue Sep 1 17:41:34 2015 +0200
Remove apache2.4-for-wheezy backport instructions; we can upgrade to jessie
now
diff --git a/autoinstall/debian-backports-itk2.4.sh
b/autoinstall/debian-backports-itk2.4.sh
deleted file mode 100755
index e889717..0000000
--- a/autoinstall/debian-backports-itk2.4.sh
+++ /dev/null
@@ -1,245 +0,0 @@
-#!/bin/bash
-# Backports Apache 2.4 and dependent modules for Debian Wheezy
-
-# Based on my
-#
https://wiki.debian.org/BuildingFormalBackports#Self-contained_example_for_Apache_2.4
-# Takes ~1h
-
-set -e
-
-# Prepare local repo
-mkdir -p /usr/src/backports/wheezy/
-touch /usr/src/backports/wheezy/Packages
-cat <<'EOF' > /usr/src/backports/wheezy/D70results
-#!/bin/bash
-# Make sure local repo is updated before building
-cd /usr/src/backports/wheezy/
-dpkg-scanpackages . /dev/null > Packages
-apt-get update
-EOF
-chmod 755 /usr/src/backports/wheezy/D70results
-
-# Create initial environment
-if [ ! -e /var/cache/pbuilder/base-wheezy-bpo.tar.gz ]; then
- sudo pbuilder --create --basetgz
/var/cache/pbuilder/base-wheezy-bpo.tar.gz \
- --distribution wheezy \
- --othermirror "deb http://security.debian.org/ wheezy/updates main|deb
http://ftp.fr.debian.org/debian wheezy-backports main|deb [trusted=yes]
file:///usr/src/backports/wheezy ./" \
- --bindmounts /usr/src/backports/wheezy/
-fi
-# Update regularly:
-# sudo pbuilder --update --basetgz /var/cache/pbuilder/base-wheezy-bpo.tar.gz
--bindmounts /usr/src/backports/wheezy/
-
-# Add source for 'apt-get source'
-echo "deb-src http://ftp.fr.debian.org/debian/ jessie main" \
- | sudo tee /etc/apt/sources.list.d/jessie-src.list
-sudo apt-get update
-
-# Setup identity
-export DEBEMAIL="[email protected]"
-export DEBFULLNAME="FusionForge Hackers"
-
-# Configure build
-export DEB_BUILD_OPTIONS="parallel=$(nproc) nocheck"
-#export DEB_BUILD_OPTIONS="parallel=$(nproc)"
-
-# Create a working directory for sources
-mkdir /usr/src/backports/sources/
-cd /usr/src/backports/sources/
-# Remove old extracted source dirs so that globbing new ones
-# will match precisely the just downloaded version only
-rm -rf apr-*/ apache2-*/ mpm-itk-*/ libgd2-*/ php5-*/ dh-php5-*/ \
- php-json-*/ xdebug-*/ subversion-*/ mod-wsgi-*/
-
-# Dependencies to add in our local repo
-apt-get source apr/jessie
-(
- cd apr-*/
- dch --bpo "No changes."
- sed -i '1 s/~bpo/~ff/' debian/changelog
- pdebuild --debbuildopts '-v1.4.6-3+deb7u1' \
- --use-pdebuild-internal --buildresult /usr/src/backports/wheezy/ \
- --pbuildersatisfydepends
/usr/lib/pbuilder/pbuilder-satisfydepends-experimental \
- -- --basetgz /var/cache/pbuilder/base-wheezy-bpo.tar.gz \
- --bindmounts /usr/src/backports/wheezy/ \
- --hookdir /usr/src/backports/wheezy/
-)
-apt-get source apr-util/jessie
-(
- cd apr-util-*/
- dch --bpo "No changes."
- sed -i '1 s/~bpo/~ff/' debian/changelog
- pdebuild --debbuildopts '-v1.4.1-3' \
- --use-pdebuild-internal --buildresult /usr/src/backports/wheezy/ \
- --pbuildersatisfydepends
/usr/lib/pbuilder/pbuilder-satisfydepends-experimental \
- -- --basetgz /var/cache/pbuilder/base-wheezy-bpo.tar.gz \
- --bindmounts /usr/src/backports/wheezy/ \
- --hookdir /usr/src/backports/wheezy/
-)
-
-# Apache 2.4 itself
-apt-get source apache2/jessie
-(
- cd apache2-*/
- dch --bpo "Note: depends on backported libapr."
- dch -a "Don't support symlink<->dir changes to avoid dpkg >= 1.17"
- sed -i -e '/^\(dir_to_symlink\|symlink_to_dir\)/d' debian/*.maintscript
- sed -i -e 's/\(dpkg\|dpkg-dev\) ([^)]*)/\1/g' debian/control
- sed -i '1 s/~bpo/~ff/' debian/changelog
- pdebuild --debbuildopts '-v2.2.22-13+deb7u3' \
- --use-pdebuild-internal --buildresult /usr/src/backports/wheezy/ \
- --pbuildersatisfydepends
/usr/lib/pbuilder/pbuilder-satisfydepends-experimental \
- -- --basetgz /var/cache/pbuilder/base-wheezy-bpo.tar.gz \
- --bindmounts /usr/src/backports/wheezy/ \
- --hookdir /usr/src/backports/wheezy/
-)
-
-# mpm_itk - separate package in Jessie
-apt-get source mpm-itk/jessie
-(
- cd mpm-itk-*/
- dch --bpo "Note: compiled against Apache 2.4.10"
- sed -i '1 s/~bpo/~ff/' debian/changelog
- pdebuild --debbuildopts '-v0' \
- --use-pdebuild-internal --buildresult /usr/src/backports/wheezy/ \
- --pbuildersatisfydepends
/usr/lib/pbuilder/pbuilder-satisfydepends-experimental \
- -- --basetgz /var/cache/pbuilder/base-wheezy-bpo.tar.gz \
- --bindmounts /usr/src/backports/wheezy/ \
- --hookdir /usr/src/backports/wheezy/
-)
-
-#####
-
-# PHP 5.6 dependency
-apt-get source libgd2/jessie
-(
- cd libgd2-*/
- dch --bpo "No changes."
- sed -i '1 s/~bpo/~ff/' debian/changelog
- pdebuild --debbuildopts '-v2.0.36~rc1~dfsg-6.1' \
- --use-pdebuild-internal --buildresult /usr/src/backports/wheezy/ \
- --pbuildersatisfydepends
/usr/lib/pbuilder/pbuilder-satisfydepends-experimental \
- -- --basetgz /var/cache/pbuilder/base-wheezy-bpo.tar.gz \
- --bindmounts /usr/src/backports/wheezy/ \
- --hookdir /usr/src/backports/wheezy/
-)
-
-# PHP 5.6 for Apache 2.4
-apt-get source php5/jessie
-(
- cd php5-*/
- dch --bpo "Note: libapache2-mod-php5 rebuilt against Apache 2.4.10"
- sed -i '1 s/~bpo/~ff/' debian/changelog
- pdebuild --debbuildopts '-v5.4.4-14+deb7u14' \
- --use-pdebuild-internal --buildresult /usr/src/backports/wheezy/ \
- --pbuildersatisfydepends
/usr/lib/pbuilder/pbuilder-satisfydepends-experimental \
- -- --basetgz /var/cache/pbuilder/base-wheezy-bpo.tar.gz \
- --bindmounts /usr/src/backports/wheezy/ \
- --hookdir /usr/src/backports/wheezy/
-)
-
-# Run-time dependency for libapache2-mod-php5
-apt-get source dh-php5/jessie
-(
- cd dh-php5-*/
- dch --bpo "No changes."
- sed -i '1 s/~bpo/~ff/' debian/changelog
- pdebuild --debbuildopts '-v0' \
- --use-pdebuild-internal --buildresult /usr/src/backports/wheezy/ \
- --pbuildersatisfydepends
/usr/lib/pbuilder/pbuilder-satisfydepends-experimental \
- -- --basetgz /var/cache/pbuilder/base-wheezy-bpo.tar.gz \
- --bindmounts /usr/src/backports/wheezy/ \
- --hookdir /usr/src/backports/wheezy/
-)
-apt-get source php-json/jessie
-(
- cd php-json-*/
- dch --bpo "No changes."
- pdebuild --debbuildopts '-v0~0' \
- --use-pdebuild-internal --buildresult /usr/src/backports/wheezy/ \
- --pbuildersatisfydepends
/usr/lib/pbuilder/pbuilder-satisfydepends-experimental \
- -- --basetgz /var/cache/pbuilder/base-wheezy-bpo.tar.gz \
- --bindmounts /usr/src/backports/wheezy/ \
- --hookdir /usr/src/backports/wheezy/
-)
-
-# PHPUnit indirect dependency - rebuilt against PHP 5.6
-apt-get source xdebug/jessie
-(
- cd xdebug-*/
- dch --bpo "Note: rebuilt against PHP 5.6."
- sed -i '1 s/~bpo/~ff/' debian/changelog
- pdebuild --debbuildopts '-v2.2.1-2' \
- --use-pdebuild-internal --buildresult /usr/src/backports/wheezy/ \
- --pbuildersatisfydepends
/usr/lib/pbuilder/pbuilder-satisfydepends-experimental \
- -- --basetgz /var/cache/pbuilder/base-wheezy-bpo.tar.gz \
- --bindmounts /usr/src/backports/wheezy/ \
- --hookdir /usr/src/backports/wheezy/
-)
-
-# Possibly backport php-wikidiff2 which mediawiki recommends
-
-# mod_dav_svn for Apache 2.4
-apt-get source subversion/jessie
-(
- cd subversion-*/
- sed -i -e 's/db5.3/db5.1/' debian/control
- dch --bpo "Use libdb5.1 instead of 5.3."
- patch -p1 <<'EOF'
-diff -u subversion-1.8.10/debian/ruby-svn.install
subversion-1.8.10/debian/ruby-svn.install
---- subversion-1.8.10/debian/ruby-svn.install
-+++ subversion-1.8.10/debian/ruby-svn.install
-@@ -1,3 +1,2 @@
- debian/tmp/usr/lib/*/libsvn_swig_ruby*.so.*
--debian/tmp/usr/lib/*/ruby
- debian/tmp/usr/lib/ruby
-diff -u subversion-1.8.10/debian/rules subversion-1.8.10/debian/rules
---- subversion-1.8.10/debian/rules
-+++ subversion-1.8.10/debian/rules
-@@ -357,7 +357,7 @@
- ifdef DEB_OPT_WITH_RUBY
- $(MAKE_B) install-swig-rb $(rb_defs) \
- DESTDIR=$(CURDIR)/debian/tmp
-- find debian/tmp/$(libdir)/ruby \( -name \*.a -o -name \*.la \) -exec
$(RM) {} +
-+ find debian/tmp/usr/lib/ruby \( -name \*.a -o -name \*.la \) -exec
$(RM) {} +
- endif
-
- cd debian/tmp/$(libdir); for lib in ra fs auth swig; do \
-EOF
- dch -a "Adapt ruby libdir as it's not multiarched in wheezy."
- dch -a "Note: compiled against Apache 2.4.10"
- sed -i '1 s/~bpo/~ff/' debian/changelog
- pdebuild --debbuildopts '-v1.6.17dfsg-4+deb7u6' \
- --use-pdebuild-internal --buildresult /usr/src/backports/wheezy/ \
- --pbuildersatisfydepends
/usr/lib/pbuilder/pbuilder-satisfydepends-experimental \
- -- --basetgz /var/cache/pbuilder/base-wheezy-bpo.tar.gz \
- --bindmounts /usr/src/backports/wheezy/ \
- --hookdir /usr/src/backports/wheezy/
-)
-
-# mod_wsgi for Apache 2.4
-apt-get source mod-wsgi/jessie
-(
- cd mod-wsgi-*/
- dch --bpo "Note: compiled against Apache 2.4.10"
- sed -i '1 s/~bpo/~ff/' debian/changelog
- pdebuild --debbuildopts '-v3.3-4+deb7u1' \
- --use-pdebuild-internal --buildresult /usr/src/backports/wheezy/ \
- --pbuildersatisfydepends
/usr/lib/pbuilder/pbuilder-satisfydepends-experimental \
- -- --basetgz /var/cache/pbuilder/base-wheezy-bpo.tar.gz \
- --bindmounts /usr/src/backports/wheezy/ \
- --hookdir /usr/src/backports/wheezy/
-)
-
-
-# Sadly there's no hook to do that *after* the packages are installed in
--buildresult
-(cd /usr/src/backports/wheezy && dpkg-scanpackages . /dev/null > Packages)
-
-#If something goes wrong and you need to test manually:
-#{{{
-#sudo pbuilder --login --basetgz /var/cache/pbuilder/base-wheezy-bpo.tar.gz
--bindmounts /usr/src/backports
-#apt-get update
-#cd /usr/src/backports/sources/apache2-2.4.10/
-#apt-get install pbuilder devscripts fakeroot
-#/usr/lib/pbuilder/pbuilder-satisfydepends-experimental
-#debuild ...
-#}}}
-----------------------------------------------------------------------
Summary of changes:
autoinstall/common-backports | 29 +---
autoinstall/debian-backports-itk2.4.sh | 245 --------------------------------
tests/func/50_PluginsScmBzr/bzrTest.php | 3 +
3 files changed, 6 insertions(+), 271 deletions(-)
delete mode 100755 autoinstall/debian-backports-itk2.4.sh
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
