diff --git a/aegir.make b/aegir.make index c98843487bf6b14b470feb6d0bc856256cd7665f..3de9e2207c975493880b6ed7fd60d12713878cae 100644 --- a/aegir.make +++ b/aegir.make @@ -6,4 +6,4 @@ projects[drupal][type] = "core" projects[hostmaster][type] = "profile" projects[hostmaster][download][type] = "git" projects[hostmaster][download][url] = "http://git.drupal.org/project/hostmaster.git" -projects[hostmaster][download][branch] = "6.x-1.x" +projects[hostmaster][download][tag] = "6.x-1.11" diff --git a/debian/changelog b/debian/changelog index 7810a4cdeca43c768593456382e0ad5837e108c6..4b9880330dde227646135a42617b9245e46fa02d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +aegir-provision (1.11) testing; urgency=high + + * fix mild security issue with login-reset links (#1220062) + * security fix: SA-CORE-2013-003, files/ protection (#2141799) + + -- Antoine Beaupré Tue, 26 Nov 2013 11:31:55 -0500 + aegir-provision (1.10) testing; urgency=high * new release: Security fixes for a moderately critical vulnerability found in diff --git a/provision.info b/provision.info index 43567aa49b14e8acb290edc2d178c9a9608ea1ce..a2150d9c56edae63f4e329c4c10ed2cbd0fe22a3 100644 --- a/provision.info +++ b/provision.info @@ -1,4 +1,4 @@ name=Provision description="Aegir backend" -version=6.x-1.x +version=6.x-1.11 diff --git a/upgrade.sh.txt b/upgrade.sh.txt index afa25d2cb93466a579ab5c42380e8991fe69c1bf..a45d180f0d802ea403e3ee11ef0121f6331dc9fb 100644 --- a/upgrade.sh.txt +++ b/upgrade.sh.txt @@ -15,7 +15,7 @@ msg() { } # basic variables, change before running -AEGIR_VERSION="6.x-1.x" +AEGIR_VERSION="6.x-1.11" DRUSH_DIR=$HOME/drush DRUSH=$DRUSH_DIR/drush.php if which drush 2> /dev/null > /dev/null && which drush | grep -v 'no drush in' > /dev/null; then