summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/APT_overlays.d/feature-12122-linux-4.90
-rw-r--r--config/APT_snapshots.d/debian/serial2
-rw-r--r--config/APT_snapshots.d/torproject/serial2
-rw-r--r--config/amnesia2
-rw-r--r--config/base_branch2
-rw-r--r--config/chroot_apt/preferences19
-rwxr-xr-xconfig/chroot_local-hooks/59-libdvd-pkg1
-rw-r--r--config/chroot_local-packageslists/tails-common.list1
-rw-r--r--debian/changelog6
-rwxr-xr-xvagrant/provision/setup-tails-builder9
-rw-r--r--wiki/src/contribute/build.mdwn4
-rw-r--r--wiki/src/contribute/build/website.mdwn8
12 files changed, 27 insertions, 29 deletions
diff --git a/config/APT_overlays.d/feature-12122-linux-4.9 b/config/APT_overlays.d/feature-12122-linux-4.9
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/config/APT_overlays.d/feature-12122-linux-4.9
diff --git a/config/APT_snapshots.d/debian/serial b/config/APT_snapshots.d/debian/serial
index 9a04579..a0f9a4b 100644
--- a/config/APT_snapshots.d/debian/serial
+++ b/config/APT_snapshots.d/debian/serial
@@ -1 +1 @@
-2017011203
+latest
diff --git a/config/APT_snapshots.d/torproject/serial b/config/APT_snapshots.d/torproject/serial
index dd875a1..a0f9a4b 100644
--- a/config/APT_snapshots.d/torproject/serial
+++ b/config/APT_snapshots.d/torproject/serial
@@ -1 +1 @@
-2017012403
+latest
diff --git a/config/amnesia b/config/amnesia
index 78602fb..d4aac96 100644
--- a/config/amnesia
+++ b/config/amnesia
@@ -22,7 +22,7 @@ AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63"
REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION="6.03~pre20"
# Kernel version
-KERNEL_VERSION='4.8.0-0.bpo.2'
+KERNEL_VERSION='4.9.0-0.bpo.2'
KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
diff --git a/config/base_branch b/config/base_branch
index 2bf5ad0..d64531f 100644
--- a/config/base_branch
+++ b/config/base_branch
@@ -1 +1 @@
-stable
+devel
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index fb9166f..83f6b07 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -88,29 +88,24 @@ Package: linux-base
Pin: release o=Debian,n=sid
Pin-Priority: 999
-Explanation: freeze exception added for Tails 2.11
Package: linux-compiler-gcc-*
-Pin: origin deb.tails.boum.org
+Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
-Explanation: freeze exception added for Tails 2.11
Package: linux-compiler-gcc-*:amd64
-Pin: origin deb.tails.boum.org
+Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
-Explanation: freeze exception added for Tails 2.11
Package: linux-headers-* linux-headers-*:amd64
-Pin: origin deb.tails.boum.org
+Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
-Explanation: freeze exception added for Tails 2.11
Package: linux-image-*-unsigned linux-image-*-unsigned:amd64
-Pin: origin deb.tails.boum.org
+Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
-Explanation: freeze exception added for Tails 2.11
Package: linux-kbuild-* linux-source-*
-Pin: origin deb.tails.boum.org
+Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
Package: monkeysphere
@@ -156,7 +151,7 @@ Pin: origin deb.tails.boum.org
Pin-Priority: 999
Package: ttdnsd
-Pin: release o=TorProject,n=sid
+Pin: origin deb.tails.boum.org
Pin-Priority: 999
Package: torsocks
@@ -164,7 +159,7 @@ Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
Package: virtualbox-guest-utils virtualbox-guest-dkms virtualbox-guest-x11
-Pin: release o=Debian,n=jessie-backports
+Pin: release o=Debian,n=sid
Pin-Priority: 999
Package: xserver-xorg-video-amdgpu
diff --git a/config/chroot_local-hooks/59-libdvd-pkg b/config/chroot_local-hooks/59-libdvd-pkg
index 1b70dd0..3c1d835 100755
--- a/config/chroot_local-hooks/59-libdvd-pkg
+++ b/config/chroot_local-hooks/59-libdvd-pkg
@@ -17,6 +17,7 @@ dpkg-reconfigure libdvd-pkg
# without the build-essential dependency to satisfy libdvdcss2.
LIBDVD_PKG_VERSION="$(dpkg-query -s libdvd-pkg | grep Version | cut -d ' ' -f2)+fake1"
install_fake_package libdvd-pkg "${LIBDVD_PKG_VERSION}" multimedia
+rm -r /usr/src/libdvd-pkg
# Verify installed packages:
for x in libdvd-pkg
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index e01c336..0859549 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -231,7 +231,6 @@ unar
usbutils
vim-nox
virtualbox-guest-utils
-virtualbox-guest-x11
wireless-tools
xsel
xul-ext-torbirdy
diff --git a/debian/changelog b/debian/changelog
index 206fcab..3db923f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tails (2.12) UNRELEASED; urgency=medium
+
+ * Dummy.
+
+ -- anonym <anonym@riseup.net> Wed, 25 Jan 2017 01:32:33 +0100
+
tails (2.11.1) UNRELEASED; urgency=medium
* Dummy entry.
diff --git a/vagrant/provision/setup-tails-builder b/vagrant/provision/setup-tails-builder
index 2135c1f..d4712dd 100755
--- a/vagrant/provision/setup-tails-builder
+++ b/vagrant/provision/setup-tails-builder
@@ -33,11 +33,6 @@ sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/discount <<EOF
Pin: origin deb.tails.boum.org
Pin-Priority: 500
EOF
-sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/ikiwiki <<EOF
- Package: ikiwiki
- Pin: origin deb.tails.boum.org
- Pin-Priority: 500
-EOF
sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/live-build <<EOF
Package: live-build
Pin: origin deb.tails.boum.org
@@ -48,6 +43,8 @@ sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/syslinux-utils <<EOF
Pin: origin deb.tails.boum.org
Pin-Priority: 500
EOF
+# remove obsolete pinning
+rm -f /etc/apt/preferences.d/ikiwiki
# We don't want to use apt-cacher-ng for gpg
if [ "${TAILS_OFFLINE_MODE}" != 1 ]; then
@@ -87,7 +84,7 @@ apt-get -y install \
eatmydata \
gettext \
git \
- ikiwiki \
+ ikiwiki/jessie-backports \
intltool \
libfile-slurp-perl \
liblist-moreutils-perl \
diff --git a/wiki/src/contribute/build.mdwn b/wiki/src/contribute/build.mdwn
index c46cbae..bf27522 100644
--- a/wiki/src/contribute/build.mdwn
+++ b/wiki/src/contribute/build.mdwn
@@ -313,7 +313,6 @@ The following Debian packages need to be installed:
dpkg-dev \
eatmydata \
gettext \
- ikiwiki \
intltool \
libfile-slurp-perl \
liblist-moreutils-perl \
@@ -331,7 +330,8 @@ The following Debian packages need to be installed:
expected versions):
apt-get install \
- debootstrap/jessie-backports
+ debootstrap/jessie-backports \
+ ikiwiki/jessie-backports
Configure live-build
--------------------
diff --git a/wiki/src/contribute/build/website.mdwn b/wiki/src/contribute/build/website.mdwn
index 39f9830..fdb316a 100644
--- a/wiki/src/contribute/build/website.mdwn
+++ b/wiki/src/contribute/build/website.mdwn
@@ -24,9 +24,9 @@ Build the website in Linux
sudo apt-get install libyaml-perl libyaml-libyaml-perl po4a \
perlmagick libyaml-syck-perl ikiwiki
- Note that in order to enable Ikiwiki with RTL language support,
- you'll need to install ikiwiki version 3.20140227 or newer.
- In Debian this version is currently available in Jessie.
+ You need to install ikiwiki version 3.20170111~bpo8+1 or newer.
+ In Debian this version is currently available in Stretch and
+ jessie-backports.
3. Clone our main [[Git repository|git]]:
@@ -65,7 +65,7 @@ Build the website in Tails
4. Install the required packages:
sudo apt-get install libyaml-perl libyaml-libyaml-perl po4a \
- perlmagick libyaml-syck-perl ikiwiki
+ perlmagick libyaml-syck-perl ikiwiki/jessie-backports
5. Clone our main [[Git repository|git]] in the <span class="filename">Persistent</span> folder: