[tor-commits] [tor-browser-build/master] Bug 29307: Use Stretch for cross-compiling for Windows

[boklm at torproject.org]

commit cfcb23a66e3ebd34b4df298f9e7550f1e0c97702
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Mar 27 19:55:24 2019 +0000

    Bug 29307: Use Stretch for cross-compiling for Windows
---
 projects/debootstrap-image/config | 23 ++++++-----------------
 projects/rust/config              |  1 +
 projects/tor-browser/config       |  3 ---
 rbm.conf                          |  2 +-
 4 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config
index 7fa3551..99326dd 100644
--- a/projects/debootstrap-image/config
+++ b/projects/debootstrap-image/config
@@ -76,30 +76,19 @@ targets:
         suite: jessie
         arch: amd64
 
-  jessie-i386:
+  stretch-amd64:
     var:
-      minimal_apt_version: 1.0.9.8.5
-      # https://lists.debian.org/debian-lts-announce/2019/01/msg00014.html
-      apt_packages_baseurl: http://security.debian.org/debian-security/pool/updates/main/a/apt
-      apt_package_filename: apt_1.0.9.8.5_i386.deb
-      apt_package_sha256sum: 13c230e9c544b1e67a8da413046bf1728526372170533b1a23e70cc99c40a228
-      apt_utils_package_filename: apt-utils_1.0.9.8.5_i386.deb
-      apt_utils_package_sha256sum: 1a74b12c8bb6b3968a721f3aa96739073e4fe2ced9302792c533e21535bc9cf4
-      libapt_inst_package_filename: libapt-inst1.5_1.0.9.8.5_i386.deb
-      libapt_inst_package_sha256sum: 5791661dd4ade72b61086fefdc209bd1f76ac7b7c812d6d4ba951b1a6232f0b9
-      libapt_pkg_package_filename: libapt-pkg4.12_1.0.9.8.5_i386.deb
-      libapt_pkg_package_sha256sum: 201b6cf4625ed175e6a024ac1f7ca6c526ca79d859753c125b02cd69e26c349d
-
+      minimal_apt_version: 1.4.9
       container:
-        suite: jessie
-        arch: i386
+        suite: stretch
+        arch: amd64
 
-  stretch-amd64:
+  stretch-i386:
     var:
       minimal_apt_version: 1.4.9
       container:
         suite: stretch
-        arch: amd64
+        arch: i386
 
 input_files:
   - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz'
diff --git a/projects/rust/config b/projects/rust/config
index 0c3b280..8d65fc6 100644
--- a/projects/rust/config
+++ b/projects/rust/config
@@ -82,6 +82,7 @@ targets:
       arch_deps:
         - libssl-dev
         - pkg-config
+        - zlib1g-dev
       configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("arch") %]-pc-windows-gnu
 
 input_files:
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 2a8d455..39093d4 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -35,9 +35,6 @@ targets:
     var:
       arch_deps:
         - python-future
-      pre_pkginst: |
-        # enable jessie-backports for python-future
-        echo 'deb http://ftp.debian.org/debian jessie-backports main' >> /etc/apt/sources.list
   windows-i686:
     var:
       mar_osname: win32
diff --git a/rbm.conf b/rbm.conf
index e2d234b..9b99a14 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -294,7 +294,7 @@ targets:
     var:
       windows: 1
       container:
-        suite: jessie
+        suite: stretch
       configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"'
       CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]'
       LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_mwindows") %]'