[tbb-commits] [builders/tor-browser-build] branch main updated: Bug 40407: Bump binutils version to pick up security improvements for Windows users

[gitolite role]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch main
in repository builders/tor-browser-build.

The following commit(s) were added to refs/heads/main by this push:
     new 4fd8903  Bug 40407: Bump binutils version to pick up security improvements for Windows users
4fd8903 is described below

commit 4fd8903b63c7e36bf16794d6cd4fcb393fc57f01
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Fri Aug 12 10:32:21 2022 +0200

    Bug 40407: Bump binutils version to pick up security improvements for Windows users
    
    Also, compiles bison from source for Linux, because Debian Jessie's is
    too old to compile binutils, and add bison to normal dependencies also
    to macOS, since all other platforms have it.
---
 projects/binutils/build  | 12 ++++++++++--
 projects/binutils/config |  6 +++++-
 projects/bison/build     | 13 +++++++++++++
 projects/bison/config    | 13 +++++++++++++
 rbm.conf                 |  1 +
 5 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/projects/binutils/build b/projects/binutils/build
index c2f4433..56903d7 100644
--- a/projects/binutils/build
+++ b/projects/binutils/build
@@ -1,5 +1,6 @@
 #!/bin/bash
 [% c("var/set_default_env") -%]
+mkdir /var/tmp/dist
 distdir=/var/tmp/dist/binutils
 [% IF c("var/linux") %]
   # Config options for hardening-wrapper
@@ -8,12 +9,19 @@ distdir=/var/tmp/dist/binutils
   export DEB_BUILD_HARDENING_FORTIFY=1
   export DEB_BUILD_HARDENING_FORMAT=1
   export DEB_BUILD_HARDENING_PIE=1
+
+  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/bison') %]
+  export PATH=/var/tmp/dist/bison/bin:$PATH
 [% END %]
+
 tar xf [% project %]-[% c("version") %].tar.xz
 cd [% project %]-[% c("version") %]
 ./configure --prefix=$distdir [% c('var/configure_opt') %]
-make -j[% c("num_procs") %]
-make install
+# Jessie's makeinfo is too old, and it makes the build fail even if installed.
+# So we replace the makeinfo calls with `true`.
+# Trick from https://stackoverflow.com/a/56159871
+make -j[% c("num_procs") %] MAKEINFO=true
+make install MAKEINFO=true
 
 [% IF c("var/linux") %]
   # Make sure gold is used with the hardening wrapper for full RELRO, see #13031.
diff --git a/projects/binutils/config b/projects/binutils/config
index c8de80a..a0c7939 100644
--- a/projects/binutils/config
+++ b/projects/binutils/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2.35.2
+version: 2.39
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 container:
   use_container: 1
@@ -17,3 +17,7 @@ input_files:
     file_gpg_id: 1
     gpg_keyring: binutils.gpg
   - project: container-image
+  - project: bison
+    name: bison
+    # We try to use system's bison, but Jessie's is too old
+    enable: '[% c("var/linux") %]'
diff --git a/projects/bison/build b/projects/bison/build
new file mode 100644
index 0000000..f53b1bf
--- /dev/null
+++ b/projects/bison/build
@@ -0,0 +1,13 @@
+#!/bin/bash
+[% c("var/set_default_env") -%]
+distdir=/var/tmp/dist/bison
+tar xf [% project %]-[% c("version") %].tar.xz
+cd [% project %]-[% c("version") %]
+./configure --prefix=$distdir
+make -j[% c("num_procs") %]
+make install
+cd /var/tmp/dist
+[% c('tar', {
+        tar_src => [ project ],
+        tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
+        }) %]
diff --git a/projects/bison/config b/projects/bison/config
new file mode 100644
index 0000000..7c2d955
--- /dev/null
+++ b/projects/bison/config
@@ -0,0 +1,13 @@
+# vim: filetype=yaml sw=2
+version: 3.8.2
+filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
+container:
+  use_container: 1
+  deps:
+    - build_essential
+    - xz-utils
+
+input_files:
+  - URL: https://ftp.gnu.org/gnu/bison/bison-[% c("version") %].tar.xz
+    sha256: 9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2
+  - project: container-image
diff --git a/rbm.conf b/rbm.conf
index e654805..b7fab76 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -536,6 +536,7 @@ targets:
         - python3
         - python3-distutils
         - automake
+        - bison
         - libtool
         - zip
         - unzip

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.