[Fusionforge-commits] FusionForge branch master updated. 745b7bbf3facce981a531bc85871ed036edb6369

Sylvain Beucler beuc-inria at fusionforge.org
Thu Feb 6 11:56:55 CET 2014


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  745b7bbf3facce981a531bc85871ed036edb6369 (commit)
       via  11b0637c2094a0b5368cf8c74151516f3f8f6b83 (commit)
       via  e4da6626a11d70cdc59a0aca9ae35777283648e2 (commit)
      from  0d2acea17d4ce3f966c3685c75d2aa6a6317306c (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 745b7bbf3facce981a531bc85871ed036edb6369
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Feb 6 11:56:13 2014 +0100

    VM: use default for security fixes (safe-upgrade)

diff --git a/tools/VM-bootstrap/http/preseed.cfg b/tools/VM-bootstrap/http/preseed.cfg
index 1739ca5..46ae53f 100755
--- a/tools/VM-bootstrap/http/preseed.cfg
+++ b/tools/VM-bootstrap/http/preseed.cfg
@@ -206,7 +206,7 @@ d-i pkgsel/include string openssh-server ntp acpid gpm  sudo bzip2 rsync  emacs2
 
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade
-d-i pkgsel/upgrade select full-upgrade
+#d-i pkgsel/upgrade select safe-upgrade
 
 # Some versions of the installer can report back on what software you have
 # installed, and what software you use. The default is not to report back,

commit 11b0637c2094a0b5368cf8c74151516f3f8f6b83
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Feb 6 10:20:59 2014 +0100

    VM: install packages where they are needed (aka minimal dependency among scripts)

diff --git a/tools/VM-scripts/build.sh b/tools/VM-scripts/build.sh
index 02fe550..3572dfd 100755
--- a/tools/VM-scripts/build.sh
+++ b/tools/VM-scripts/build.sh
@@ -14,6 +14,12 @@
 
 #set -x
 
+
+# Build dependencies
+aptitude -y install mini-dinstall dput devscripts equivs
+mk-build-deps -i /root/fusionforge/src/debian/control -t 'apt-get -y' -r
+
+
 # Populate the repo
 rm -rf /root/debian-repository
 mkdir -p /root/debian-repository
diff --git a/tools/VM-scripts/install.sh b/tools/VM-scripts/install.sh
index 38c71ad..5f8e630 100755
--- a/tools/VM-scripts/install.sh
+++ b/tools/VM-scripts/install.sh
@@ -20,6 +20,11 @@ fi
 
 set -e
 
+# "Backport" recent dependency
+wget http://ftp.fr.debian.org/debian/pool/main/l/loggerhead/loggerhead_1.19~bzr479-3_all.deb
+aptitude install gdebi-core
+gdebi --non-interactive loggerhead_1.19~bzr479-3_all.deb
+
 aptitude update
 if dpkg -l fusionforge-full | grep -q ^ii ; then
     # Already installed, upgrading
diff --git a/tools/VM-scripts/run-testsuite.sh b/tools/VM-scripts/run-testsuite.sh
index 8d4738a..1287fcb 100755
--- a/tools/VM-scripts/run-testsuite.sh
+++ b/tools/VM-scripts/run-testsuite.sh
@@ -1,5 +1,14 @@
 #! /bin/sh
 
+# Test dependencies
+aptitude -y install php5-cli phpunit phpunit-selenium
+
+# If available, install the JUnit OSLC provider test suite
+if [ -d src/plugins/oslc/tests ]; then
+    cd /root/fusionforge/src/plugins/oslc/tests
+    ./setup-provider-test.sh
+fi
+
 export CONFIG_PHP=/root/fusionforge/tests/func/config.php.ffsandbox
 
 # Run the phpunit + Selenium functional tests
diff --git a/tools/VM-scripts/start-selenium.sh b/tools/VM-scripts/start-selenium.sh
index b239211..a3a824a 100755
--- a/tools/VM-scripts/start-selenium.sh
+++ b/tools/VM-scripts/start-selenium.sh
@@ -17,5 +17,8 @@ echo
 echo "You may wish to install a graphical environment (gnome, kde, lxde, ...) to run the selenium server inside the VM's display."
 echo
 
+# Test dependencies
+aptitude -y install default-jre iceweasel
+
 cd /root/fusionforge/3rd-party/selenium
 make
diff --git a/tools/VM-scripts/update.sh b/tools/VM-scripts/update.sh
index 3f06eef..542cef6 100755
--- a/tools/VM-scripts/update.sh
+++ b/tools/VM-scripts/update.sh
@@ -11,32 +11,12 @@
 aptitude update
 aptitude -y dist-upgrade
 
-# Make sure to add tools needed for build.sh
-aptitude -y install mini-dinstall dput devscripts equivs
-mk-build-deps -i /root/fusionforge/src/debian/control -t 'aptitude -y' -r
-
-# "Backport" recent dependency
-wget http://ftp.fr.debian.org/debian/pool/main/l/loggerhead/loggerhead_1.19~bzr479-3_all.deb
-aptitude install gdebi-core
-gdebi --non-interactive loggerhead_1.19~bzr479-3_all.deb
-
-
 set -e
 
 cd /root/fusionforge
-
 # If using bzr, or git, update accordingly
 if [ -d .bzr/ ] ; then
     bzr update
 else
     git pull
 fi
-
-# If available, install the JUnit OSLC provider test suite
-if [ -d src/plugins/oslc/tests ]; then
-    cd /root/fusionforge/src/plugins/oslc/tests
-    ./setup-provider-test.sh
-fi
-
-# Test dependencies
-aptitude -y install php5-cli phpunit phpunit-selenium default-jre iceweasel

commit e4da6626a11d70cdc59a0aca9ae35777283648e2
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Feb 6 10:19:53 2014 +0100

    VM: Apply security fixes during the preseed-ing phase

diff --git a/tools/VM-bootstrap/http/preseed.cfg b/tools/VM-bootstrap/http/preseed.cfg
index 1ec31c6..1739ca5 100755
--- a/tools/VM-bootstrap/http/preseed.cfg
+++ b/tools/VM-bootstrap/http/preseed.cfg
@@ -206,7 +206,7 @@ d-i pkgsel/include string openssh-server ntp acpid gpm  sudo bzip2 rsync  emacs2
 
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade
-d-i pkgsel/upgrade select none
+d-i pkgsel/upgrade select full-upgrade
 
 # Some versions of the installer can report back on what software you have
 # installed, and what software you use. The default is not to report back,

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

Summary of changes:
 tools/VM-bootstrap/http/preseed.cfg |    2 +-
 tools/VM-scripts/build.sh           |    6 ++++++
 tools/VM-scripts/install.sh         |    5 +++++
 tools/VM-scripts/run-testsuite.sh   |    9 +++++++++
 tools/VM-scripts/start-selenium.sh  |    3 +++
 tools/VM-scripts/update.sh          |   20 --------------------
 6 files changed, 24 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list