Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libxml2: 2.9.5 -> 2.9.7 (fixes CVE-2017-15412) #33844

Closed
wants to merge 2,735 commits into from
Closed

Conversation

andir
Copy link
Member

@andir andir commented Jan 14, 2018

Motivation for this change

libxml2: 2.9.5 -> 2.9.7 (fixes CVE-2017-15412)

For details see [1].

[1] https://git.gnome.org/browse/libxml2/commit/?id=0f3b843b3534784ef57a4f9b874238aa1fda5a73

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

vcunat and others added 30 commits December 26, 2017 18:54
Fixes CVE-2017-16996, just as the preceding 4.14 update.

(cherry picked from commit b0047e7)
(cherry picked from commit 15b2a76)
(cherry picked from commit 1de251c)
(cherry picked from commit b3facac)
[...]
make modules -C /nix/store/h1vzl6bq4wif3m8dd1bw2p3fv4shjg3n-linux-4.14.9-dev/lib/modules/4.14.9/build EXTRA_CFLAGS=-Werror-implicit-function-declaration M=/tmp/nix-build-spl-kernel-2017-11-16-4.14.9.drv-0/source/build
/nix/store/h1vzl6bq4wif3m8dd1bw2p3fv4shjg3n-linux-4.14.9-dev/lib/modules/4.14.9/source/Makefile:939: *** "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel". Stop.

This patch introduces kernel.moduleBuildDependencies to avoid the logic "stdenv.lib.optional (stdenv.lib.versionAtLeast kernel.version "4.14") libelf" in multiple places.

[dezgeg did some minor tweaks on top]

(cherry picked from commit 1e77d0b)
Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
(cherry picked from commit d1bfa7e)
Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
(cherry picked from commit a3c45b3)
This package only contains a kernel module.

(cherry picked from commit 84d8ef6)
In this expression the boolean flags `buildUser` and `buildKernel` determine
if either userspace tools or the kernel module is being built.

cc NixOS#33166

(cherry picked from commit 6b74d2c)
(cherry picked from commit f497999)
Second attempt.

(cherry picked from commit 0d32189)
(cherry picked from commit 92800cfd4798ca7c4f27e08c3a335262d64c91ee)
(cherry picked from commit 16a6abcf4be1ffce4087c7b6869052b4bcda31ca)
(cherry picked from commit aea6afabe6028180906aa0b4ba41b9365ec0f7f7)
(cherry picked from commit ea059d06e795a947cf0a80a02164b8a60bedf6a7)
Support is perhaps claimed upstream, but it's never built successfully
on Hydra, so let's disable that until someone fixes it.

(cherry picked from commit 616048b)
adisbladis and others added 19 commits January 12, 2018 11:17
(cherry picked from commit 2377d7b)
(cherry picked from commit f2bca29)
The test was updated as minio now needs at least 1 GiB of free disk,
otherwise it won't start.

(cherry picked from commit 1983e6c)
Contains security fixes (see: https://blog.minio.io/minio-release-jan-2nd-2018-security-advisory-ef0342a4ddba)

Use buildGoPackage, otherwise we will have the go build toolchain in our runtime closure.

(cherry picked from commit dffe1e5)
gcc provides wrappers for binutils' ar, nm and ranlib
executables, which must be used instead when using link-time
optimisation. See also:
http://manpages.ubuntu.com/manpages/zesty/man1/aarch64-linux-gnu-gcc-ar-5.1.html

The upstream version of avr-gcc-ar searches in paths passed to
the configure script for the avr-ar binary that it wraps, falling
back to searching PATH instead. Thus currently avr-gcc-ar works on
Nix, but only if avrbinutils is already in the environment.

This change bakes the path to avr-ar into avr-gcc-ar, since its path
is known at compile time. It also no longer searches PATH, meaning the
user's local environment won't override this path.

Note that avr-gcc-nm and avr-gcc-ranlib are compiled from the same
source file as avr-gcc-ar, just with different compiler flags.

Testing on master (without avrbinutils in the environment):

    $ nix-build -A avrgcc
    $ result/bin/avr-gcc-ar --version
    result/bin/avr-gcc-ar: Cannot find binary 'avr-ar'

Testing on branch with this fix:

    $ nix-build -A avrgcc
    $ result/bin/avr-gcc-ar --version
    GNU ar (GNU Binutils) 2.26.20160125
    ...

(cherry picked from commit 6bfa422)
This reverts commit fcf3458.

Pleasee don't patch Nix projects in Nixpkgs.
This reverts commit eb64a95.

Please don't patch Nix projects in Nixpkgs.
Ruby: 2.2.8 -> 2.2.9, 2.3.5 -> 2.3.6, 2.4.2 -> 2.4.3
(cherry picked from commit fa3aec7)
(cherry picked from commit 1855060)
(cherry picked from commit 397157c)
@andir
Copy link
Member Author

andir commented Jan 14, 2018

arghs,

@andir andir closed this Jan 14, 2018
@andir andir deleted the 17.09/libxml2 branch January 14, 2018 00:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet