summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-10-19 12:54:32 +0000
committerintrigeri <intrigeri@boum.org>2019-10-20 08:02:41 +0000
commit75c1f2976f3f00c3beacd284aaef05472bb962b9 (patch)
tree3c341d760b50d281bea810021c7e767885ec73f3 /vagrant
parent79b987e9ba0f9efd7a3509e505125ffd7f1f2fe5 (diff)
Vagrant: install po4a from Stretch in the basebox (refs: #16868)
We install it from our builder-jessie (sic) APT suite. Given we use time-based APT snapshots even for our own overlay APT suites, this requires bumping the corresponding snapshot to a version that includes the desired version of po4a.
Diffstat (limited to 'vagrant')
-rw-r--r--vagrant/definitions/tails-builder/config/APT_snapshots.d/tails/serial2
-rwxr-xr-xvagrant/definitions/tails-builder/postinstall.sh8
2 files changed, 8 insertions, 2 deletions
diff --git a/vagrant/definitions/tails-builder/config/APT_snapshots.d/tails/serial b/vagrant/definitions/tails-builder/config/APT_snapshots.d/tails/serial
index 67f21113..e626b97 100644
--- a/vagrant/definitions/tails-builder/config/APT_snapshots.d/tails/serial
+++ b/vagrant/definitions/tails-builder/config/APT_snapshots.d/tails/serial
@@ -1 +1 @@
-2019100904
+2019102001
diff --git a/vagrant/definitions/tails-builder/postinstall.sh b/vagrant/definitions/tails-builder/postinstall.sh
index 345658f..e77002b 100755
--- a/vagrant/definitions/tails-builder/postinstall.sh
+++ b/vagrant/definitions/tails-builder/postinstall.sh
@@ -49,7 +49,7 @@ cat "/etc/apt/sources.list" | \
echo "deb http://time-based.snapshots.deb.tails.boum.org/debian-security/${DEBIAN_SECURITY_SERIAL}/ buster/updates main" \
> "/etc/apt/sources.list.d/buster-security.list"
-echo "I: Adding our builder-jessie suite with live-build and pinning it low..."
+echo "I: Adding our builder-jessie suite with live-build and po4a..."
echo "deb http://time-based.snapshots.deb.tails.boum.org/tails/${TAILS_SERIAL}/ builder-jessie main" > "/etc/apt/sources.list.d/tails.list"
sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/tails <<EOF
Package: *
@@ -61,6 +61,12 @@ sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/live-build <<EOF
Pin: release o=Tails,n=builder-jessie
Pin-Priority: 999
EOF
+# Install po4a 0.47 for now (#17005)
+sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/po4a <<EOF
+ Package: po4a
+ Pin: release o=Tails,n=builder-jessie
+ Pin-Priority: 999
+EOF
sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/buster-backports << EOF
Package: *