From ce27857f710ff32c05f4ba19a04a695c1cc2ce20 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 17 Sep 2017 21:13:22 +0300 Subject: gnu: binutils: Fix security issues. * gnu/packages/base.scm (binutils)[replacement]: New field. (binutils/fixed): New variable. * gnu/packages/commencement.scm (binutils-boot0, binutils-final): Use 'package/inherit' to correctly use replacement binutils. --- gnu/packages/base.scm | 14 ++++++++++++++ gnu/packages/commencement.scm | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 1ccff1fcf5..972ffeeecb 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -394,6 +394,7 @@ change. GNU make offers many powerful extensions over the standard utility.") (define-public binutils (package + (replacement binutils/fixed) (name "binutils") (version "2.28") (source (origin @@ -435,6 +436,19 @@ included.") (license gpl3+) (home-page "https://www.gnu.org/software/binutils/"))) +(define binutils/fixed + (package + (inherit binutils) + ;; 2.28.1 is two characters longer than 2.28, so grafting fails due to + ;; mismatched lengths of filenames, so we have to force it to the same length. + (version "2281") + (source + (origin (inherit (package-source binutils)) + (uri "mirror://gnu/binutils/binutils-2.28.1.tar.bz2") + (sha256 + (base32 + "1sj234nd05cdgga1r36zalvvdkvpfbr12g5mir2n8i1dwsdrj939")))))) + (define* (make-ld-wrapper name #:key (target (const #f)) binutils diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7bbe1becd9..ec7677814f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2017 Mark H Weaver +;;; Copyright © 2017 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -139,7 +140,7 @@ (define binutils-boot0 (package-with-bootstrap-guile - (package (inherit binutils) + (package/inherit binutils (name "binutils-cross-boot0") (arguments `(#:guile ,%bootstrap-guile @@ -667,7 +668,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define binutils-final (package-with-bootstrap-guile - (package (inherit binutils) + (package/inherit binutils (arguments `(#:guile ,%bootstrap-guile #:implicit-inputs? #f -- cgit v1.2.3 635f7a4e2178b321f949e533402e3cf2987&showmsg=1'>Expand)Author 2019-06-13daemon: Replace "illegal" by "invalid" in error messages....* nix/libstore/build.cc (parseReferenceSpecifiers): Replace "illegal" by "invalid". * nix/libstore/globals.cc (Settings::pack): Likewise. * nix/libstore/store-api.cc (checkStoreName): Likewise. Ludovic Courtès 2018-12-16daemon: Use unbranded phrases in comments and messages....* nix/libstore/build.cc, nix/libstore/globals.cc, nix/libstore/gc.cc, nix/libstore/local-store.cc, nix/libstore/optimise-store.cc, nix/libstore/store-api.cc, nix/libutil/archive.cc, nix/nix-daemon/nix-daemon.cc: Replace "Nix store" by "store", and "Nix daemon" by "build daemon". Ludovic Courtès 2018-06-14Remove 'guix-register' and its traces....* Makefile.am (SH_TESTS): Remove tests/guix-register.sh. * build-aux/pre-inst-env.in (GUIX_REGISTER): Remove. * gnu/build/install.scm (directives): Remove outdated comment. * gnu/build/vm.scm (root-partition-initializer): Update comment. * gnu/packages/package-management.scm (guix-register): Remove. * guix/config.scm.in (%sbindir, %guix-register-program): Remove. * guix/scripts/system.scm (install): Adjust docstring. * guix/self.scm (make-config.scm): Remove #:guix. Do not generate %sbindir and %guix-register-program. (specification->package): Remove "guix". * nix/guix-register/guix-register.cc: Remove. * nix/libstore/store-api.cc (decodeValidPathInfo): Remove. * nix/libstore/store-api.hh (decodeValidPathInfo): Remove declaration. * nix/local.mk (sbin_PROGRAMS, guix_register_SOURCES) (guix_register_CPPFLAGS, guix_register_LDFLAGS): Remove. * tests/guix-register.sh: Remove. Ludovic Courtès 2018-03-30daemon: Remove dead code....* nix/libstore/globals.cc (Settings::loadConfFile, Settings::unpack): Remove. * nix/libstore/globals.hh: Adjust accordingly. * nix/libstore/misc.cc (queryMissing): Remove. * nix/libstore/misc.hh: Adjust accordingly. * nix/libstore/store-api.cc (followLinksToStore) (followLinksToStorePath, computeStorePathForHash): Remove. * nix/libstore/store-api.hh: Adjust accordingly. Ludovic Courtès