Age | Commit message (Collapse) | Author | Files | Lines |
|
/cc #41748.
|
|
This update includes the removed patches (CVE-2017-14632,
CVE-2017-14633) and additionally fixes CVE-2018-5146 [1].
The changelog:
libvorbis 1.3.6 (2018-03-16) -- "Xiph.Org libVorbis I 20180316 (Now 100% fewer shells)"
* Fix CVE-2018-5146 - out-of-bounds write on codebook decoding.
* Fix CVE-2017-14632 - free() on unitialized data
* Fix CVE-2017-14633 - out-of-bounds read
* Fix bitrate metadata parsing.
* Fix out-of-bounds read in codebook parsing.
* Fix residue vector size in Vorbis I spec.
* Appveyor support
* Travis CI support
* Add secondary CMake build system.
* Build system fixes
[1] http://seclists.org/oss-sec/2018/q1/243
|
|
|
|
|
|
Make either 'bin' or 'out' the first output.
|
|
|
|
Communication happens on Github so names should be consistent.
|
|
Many non-conflict problems weren't (fully) resolved in this commit yet.
|
|
|
|
This reverts commit 5728c06f8320e134795374f35289ee6590ba2f85.
|
|
This reverts commit ca5c9e6cf2ea5a7367154c52b41072722924ef2b.
|
|
|
|
This reverts commit bd55792892dc6cc5db172e41f2b36998b3397143.
|
|
|
|
|
|
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
|
|
|
|
|
|
|
|
|
|
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
|
|
|
|
|
|
Conflicts:
pkgs/development/libraries/acl/default.nix
pkgs/development/libraries/atk/2.6.x.nix
pkgs/development/libraries/attr/default.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/2.34.x.nix
pkgs/development/libraries/gtk+/2.24.x.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/openssl/default.nix
pkgs/development/libraries/pango/1.30.x.nix
pkgs/misc/cups/default.nix
pkgs/os-specific/linux/util-linux/default.nix
pkgs/servers/x11/xorg/builder.sh
pkgs/servers/x11/xorg/default.nix
pkgs/top-level/all-packages.nix
|
|
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
|
|
This way we can merge it into stdenv.mkDerivation later without having
to modify any package expressions (except the overrides in
all-packages.nix).
|
|
|
|
|
|
on ffmpeg.
I think there are little drawbacks on that, whlie there are benefits.
svn path=/nixpkgs/trunk/; revision=32145
|
|
svn path=/nixpkgs/trunk/; revision=26943
|
|
svn path=/nixpkgs/trunk/; revision=22838
|
|
svn path=/nixpkgs/branches/stdenv-updates/; revision=19511
|
|
svn path=/nixpkgs/trunk/; revision=13813
|
|
svn path=/nixpkgs/trunk/; revision=10011
|
|
URLs to http://nix.cs.uu.nl/dist/tarballs. With content-addressable
mirror support (r9190, NIXPKGS-70) this is no longer necessary:
fetchurl will try to download from that location automatically. So
we can keep the original URLs.
svn path=/nixpkgs/trunk/; revision=9192
|
|
svn path=/nixpkgs/trunk/; revision=6711
|
|
svn path=/nixpkgs/trunk/; revision=5639
|
|
svn path=/nixpkgs/trunk/; revision=3660
|
|
svn path=/nixpkgs/trunk/; revision=2245
|
|
gazillion different servers. Resurrected some 25 missing files.
svn path=/nixpkgs/trunk/; revision=2237
|
|
svn path=/nixpkgs/trunk/; revision=2063
|