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 e5ff68070aac47648b947483102478def0b902bf (commit)
from dc9a80e2207b6d2d9abb181e2f0c07af74b7d13b (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 e5ff68070aac47648b947483102478def0b902bf
Author: Roland Mas <[email protected]>
Date: Tue Apr 7 16:29:45 2015 +0200
No longer rebuild httpd and httpd-itk on centos7: both packages are now
available in the repositories (epel-testing for httpd-itk)
diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index 3520692..9687789 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -182,42 +182,6 @@ EOF
case $os_version in
7)
- # Backport httpd-itk from Fedora
- # until https://bugzilla.redhat.com/show_bug.cgi?id=1059143 is fixed
- #
- # apr > 1.5: httpd 2.4.10 BuildRequires and Requires
- DEPS="libuuid-devel lksctp-tools-devel autoconf libtool"
- REMOVEDEPS=$DEPS
- backport_rpm_from_fedora --source-package apr apr-1.5.1
apr-devel-1.5.1
-
- # httpd 2.4.10 (not 2.4.7): required for mod_itk to compile
- if ! rpm -q httpd | grep -q 2.4.10; then
- DEPS="xmlto gcc libselinux-devel lua-devel pcre-devel
openssl-devel libxml2-devel apr-util-devel systemd-devel"
- REMOVEDEPS=$DEPS
- yum install -y $DEPS
- yumdownloader --enablerepo=fedora-source
--enablerepo=fedora-updates-source \
- --source httpd
- rpm -ivh httpd-*.src.rpm
- # Remove generic-logos dependency, it itself has a lot of
dependencies,
- # and it's only for unused /usr/share/pixmaps/poweredby.png
- sed -i -e '/Requires/ s/, system-logos-httpd//'
~/rpmbuild/SPECS/httpd.spec
- rpmbuild -bb ~/rpmbuild/SPECS/httpd.spec
- yum install -y ~/rpmbuild/RPMS/*/httpd-[0-9]*.rpm \
- ~/rpmbuild/RPMS/*/httpd-tools-[0-9]*.rpm
- yum install -y ~/rpmbuild/RPMS/*/mod_ssl-[0-9]*.rpm
- yum install -y ~/rpmbuild/RPMS/*/httpd-devel-[0-9]*.rpm # for
itk
- # Note: F21 introduces httpd-filesystem (which needs to be
installed),
- # and requires newer openssl-libs (which needs to be
backported).
- # Let's stick to F20 until #1059143 above is fixed (in CentOS
7.1).
- fi
-
- # mod_itk itself
- DEPS=""
- REMOVEDEPS=$DEPS
- backport_rpm_from_fedora --source-package httpd-itk
httpd-itk-2.4.7.01
- #
- # End of backport for httpd-itk + related packages
-
# viewvc: not available in EPEL7
if yum list viewvc >/dev/null 2>&1; then
yum install -y viewvc
@@ -233,7 +197,7 @@ EOF
rpmbuild -bb ~/rpmbuild/SPECS/viewvc.spec
yum install -y ~/rpmbuild/RPMS/*/viewvc-[0-9]*.rpm
fi
-
+
# mediawiki available in EPEL6 but not in EPEL7
# Note: we don't support mediawiki > 1.19 as of 2014-01
if yum list mediawiki >/dev/null 2>&1; then
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index fddec27..6c30a63 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -43,11 +43,12 @@ else
yum install -y make tar
backports_rpm
yum install -y gettext php-cli php-pgsql php-process php-mbstring \
- httpd httpd-itk mod_dav_svn mod_ssl postgresql-server nscd \
+ httpd mod_dav_svn mod_ssl postgresql-server nscd \
subversion augeas viewvc python-pycurl git gitweb \
mediawiki119 \
moin mod_wsgi python-psycopg2 \
unoconv poppler-utils
+ yum --enablerepo=epel-testing install -y httpd-itk
fi
(
diff --git a/autoinstall/install.sh b/autoinstall/install.sh
index b4fc70d..467c021 100755
--- a/autoinstall/install.sh
+++ b/autoinstall/install.sh
@@ -54,7 +54,7 @@ else
yum upgrade -y
else
# Initial installation
- yum install -y fusionforge fusionforge-shell fusionforge-scm \
+ yum --enablerepo=epel-testing install -y fusionforge fusionforge-shell
fusionforge-scm \
fusionforge-plugin-scmgit fusionforge-plugin-scmsvn \
fusionforge-plugin-mediawiki \
fusionforge-plugin-blocks fusionforge-plugin-online_help
fusionforge-plugin-taskboard
diff --git a/src/post-install.d/web/web.sh b/src/post-install.d/web/web.sh
index b70d1cf..cda511f 100755
--- a/src/post-install.d/web/web.sh
+++ b/src/post-install.d/web/web.sh
@@ -118,14 +118,17 @@ case "$1" in
#a2enmod proxy_http
a2enmod authz_groupfile
a2enmod dav
+ else
+ if ! [ -e /etc/httpd/conf.modules.d/00-macro.conf ] ; then
+ echo "LoadModule macro_module modules/mod_macro.so" >
/etc/httpd/conf.modules.d/00-macro.conf
+ fi
+ if [ -e /etc/httpd/conf.modules.d/00-mpm-itk.conf ] \
+ && ! grep -q ^LoadModule.mpm_itk_module
/etc/httpd/conf.modules.d/00-mpm-itk.conf ; then
+ sed -i -e s/^#LoadModule/LoadModule/
/etc/httpd/conf.modules.d/00-mpm-itk.conf
+ fi
fi
- # else: Apache modules already enabled in CentOS
# Enable mpm-itk on RH/CentOS
- if [ -e /etc/httpd/conf.modules.d/00-mpm-itk.conf ] \
- && ! grep -q ^LoadModule.mpm_itk_module
/etc/httpd/conf.modules.d/00-mpm-itk.conf ; then
- sed -i -e s/^#LoadModule/LoadModule/
/etc/httpd/conf.modules.d/00-mpm-itk.conf
- fi
if [ -x /usr/sbin/a2dissite ]; then
a2dissite 000-default
diff --git a/tests/buildbot/common-functions b/tests/buildbot/common-functions
index cde2094..f82d9f1 100644
--- a/tests/buildbot/common-functions
+++ b/tests/buildbot/common-functions
@@ -76,6 +76,24 @@ EOF
fi
}
+setup_epel_testing_repo()
+{
+if [ -z "$HOST" ] ; then echo "HOST undefined" ;exit 1; fi
+HOST=$1
+# EPEL Testing REPO
+echo "Installing EPEL Testing REPO"
+ssh root@$HOST "cat > /etc/yum.repos.d/epel-testing.repo" <<-EOF
+# Name: EPEL RPM Repository for Red Hat Enterprise Testing \$releasever - epel
+# URL: http://fedoraproject.org/wiki/EPEL
+[epel-testing]
+name=Extra Packages for Enterprise Linux Testing \$releasever - \$basearch
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel\$releasever&arch=\$basearch
+failovermethod=priority
+enabled=0
+gpgcheck=0
+EOF
+}
+
setup_dag_repo()
{
HOST=$1
diff --git a/tests/buildbot/fusionforge-build-and-test.sh
b/tests/buildbot/fusionforge-build-and-test.sh
index 4c15915..1fae4bf 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -64,6 +64,8 @@ if [ $INSTALL_OS == "debian" ]; then
ssh root@$HOST "apt-get install -y rsync"
else
ssh root@$HOST "yum install -y rsync"
+ setup_epel_repo
+ setup_epel_testing_repo
fi
rsync -av --delete autoinstall src tests root@$HOST:/usr/src/fusionforge/
if [ $INSTALL_METHOD = "src" ]; then
-----------------------------------------------------------------------
Summary of changes:
autoinstall/common-backports | 38 +-------------------------
autoinstall/install-src.sh | 3 +-
autoinstall/install.sh | 2 +-
src/post-install.d/web/web.sh | 13 +++++----
tests/buildbot/common-functions | 18 ++++++++++++
tests/buildbot/fusionforge-build-and-test.sh | 2 ++
6 files changed, 32 insertions(+), 44 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
