Skip to content

Commit

Permalink
glibc: security 2.24 -> 2.25
Browse files Browse the repository at this point in the history 
https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html

Stripping was failing on libm.a; I don't know why.

(cherry picked from commit a01f8a4)
  • Loading branch information
@vcunat
vcunat committed Feb 11, 2017
1 parent a260f5f commit fd7e5cb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions pkgs/development/libraries/glibc/common.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ cross:
, preConfigure ? "", ... }@args:

let
version = "2.24";
sha256 = "1ghzp41ryvsqxn4rhrm8r25wc33m2jf8zrcc1pj3jxyk8ad9a0by";
version = "2.25";
sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0";
in

assert cross != null -> gccCross != null;
Expand Down Expand Up @@ -138,7 +138,7 @@ stdenv.mkDerivation ({
lib.optionalString (cross != null) "-${cross.config}";

src = fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
url = "mirror://gnu/glibc/glibc-${version}.tar.xz";
inherit sha256;
};

Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/libraries/glibc/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ in
# the .so It used to be a symlink, but now it is a script
cp -a ${stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so
fi
set -x
'';

postInstall = ''
Expand Down Expand Up @@ -81,7 +82,7 @@ in
# to bootstrap-tools; on cross-arm this stripping would break objects.
if [ -z "$crossConfig" ]; then
for i in "$out"/lib/*.a; do
strip -S "$i"
[ "$i" = "$out/lib/libm.a" ] || strip -S "$i"
done
fi
Expand Down

6 comments on commit fd7e5cb

@grahamc
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 a01f8a4 (what it was cherry-picked from) doesn't seem to exist in nixpkgs. Is this still coming?

@vcunat
Copy link
Member Author

@vcunat vcunat commented on fd7e5cb Feb 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I'm waiting with the push – micro-managing Hydra.

@vcunat
Copy link
Member Author

@vcunat vcunat commented on fd7e5cb Feb 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should add that the issue has been public since 2015 and is considered of low impact...

@vcunat
Copy link
Member Author

@vcunat vcunat commented on fd7e5cb Feb 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, maybe this bump isn't worth it in stable. There have been some changes in macro definitions etc. – already host and fontconfig need patching.

@vcunat
Copy link
Member Author

@vcunat vcunat commented on fd7e5cb Feb 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Separate thread: #22699

@vcunat
Copy link
Member Author

@vcunat vcunat commented on fd7e5cb Feb 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That commit is staged now. I've built lots of programs, so there shouldn't be mass (build) failures anymore.

Please sign in to comment.