[Fusionforge-commits] FusionForge branch master updated. 33de64e2104af5f1b8e2dba73bd1d5664d6d1f96

Sylvain Beucler beuc-inria at fusionforge.org
Tue Jan 13 16:17:28 CET 2015


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  33de64e2104af5f1b8e2dba73bd1d5664d6d1f96 (commit)
       via  ef5cf9fee762774e8e757f471d87e65120048cc5 (commit)
       via  15040f1d1882e077a5cfdec0947daced3d43cbe2 (commit)
       via  7c62200e1d40c2ab5913995262e656df080e4d8d (commit)
      from  752877f5c51a3165c3ea7b71d04021f9ed500b59 (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 33de64e2104af5f1b8e2dba73bd1d5664d6d1f96
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Jan 13 16:16:14 2015 +0100

    install: fix 'yum always updates cache' slowness issue

diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index 35284f1..caa3d6c 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -191,7 +191,12 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source
 enabled=0
 gpgcheck=0
 EOF
-	yum install -y yum-utils # yumdownloader
+
+	# Speed-up by recreating 'fastestmirror' now partial cache
+	# (/var/cache/yum/x86_64/7/timedhost.txt)
+        yum clean plugins
+
+	yum install -y yum-utils  # yumdownloader
 	if [ ! -e /usr/bin/rpmbuild ] ; then
 	    yum install -y rpm-build
 	fi

commit ef5cf9fee762774e8e757f471d87e65120048cc5
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Jan 13 16:15:04 2015 +0100

    install: document backports rationale

diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index f1f9442..35284f1 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -199,10 +199,13 @@ EOF
 
     yum install -y gcc gcc-c++ postgresql-devel python-devel libpng-devel sqlite-devel autoconf libtool systemd-devel freetype-devel
 
+    # libnss-pgsql: no available package for RHEL; though it's available in Fedora
+    # (there's also http://yum.postgresql.org/8.4/redhat/rhel-5-x86_64/)
     DEPS="xmlto"
     REMOVEDEPS=$DEPS
     backport_rpm_from_fedora libnss-pgsql
 
+    # moin: no available package for RHEL; though it's available in Fedora
     DEPS=""
     REMOVEDEPS=$DEPS
     backport_rpm_from_fedora moin

commit 15040f1d1882e077a5cfdec0947daced3d43cbe2
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Jan 13 16:14:08 2015 +0100

    install: only rebuild mediawiki on centos7

diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index c89b131..f1f9442 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -241,6 +241,15 @@ EOF
 	    backport_rpm_from_fedora_updates --source-package httpd-itk httpd-itk-2.4.7.01
 	    #
 	    # End of backport for httpd-itk + related packages
+
+	    # No mediawiki in EPEL7
+	    DEPS=""
+	    REMOVEDEPS=$DEPS
+	    backport_rpm_from_fedora mediawiki
+	    ;;
+
+	6)
+	    yum install mediawiki119
 	    ;;
     esac
 
@@ -252,10 +261,6 @@ EOF
     REMOVEDEPS=""
     backport_rpm_from_fedora php-htmlpurifier-htmlpurifier
 
-    DEPS=""
-    REMOVEDEPS=$DEPS
-    backport_rpm_from_fedora mediawiki
-
     # TODO: postfix: rebuild from RHEL/CentOS sources with pgsql enabled,
     # so we can test mta-postfix
 }

commit 7c62200e1d40c2ab5913995262e656df080e4d8d
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Jan 13 16:12:23 2015 +0100

    install: centos: httpd 2.4.7 and 2.4.10 API are compatible, so no need to rebuild PHP nor mod_wsgi (unlike 2.2 vs. 2.4 in Debian Wheezy)

diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index 0339fbe..c89b131 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -219,8 +219,6 @@ EOF
 
 	    # Backport httpd-itk from Fedora 20
 	    # until https://bugzilla.redhat.com/show_bug.cgi?id=1059143 is fixed
-	    # …yes, it requires pulling in a lot of stuff :-(
-	    #
 	    #
 	    DEPS="libuuid-devel lksctp-tools-devel"
 	    REMOVEDEPS=$DEPS
@@ -241,25 +239,6 @@ EOF
 	    DEPS=""
 	    REMOVEDEPS=$DEPS
 	    backport_rpm_from_fedora_updates --source-package httpd-itk httpd-itk-2.4.7.01
-
-	    DEPS=""
-	    REMOVEDEPS=$DEPS
-	    rebuild_rpm_from_centos mod_wsgi
-
-	    if ! rpm -qR php | grep -q httpd.*2.4.10 ; 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
-	    #
 	    #
 	    # End of backport for httpd-itk + related packages
 	    ;;

-----------------------------------------------------------------------

Summary of changes:
 autoinstall/common-backports |   40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list