Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 904494c4435b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 67584243c801
Choose a head ref
  • 3 commits
  • 1 file changed
  • 3 contributors

Commits on Jan 2, 2020

  1. cyrus_sasl: add patch for CVE-2019-19906 

    sourced from debian as patch isn't even in upstream master yet.

(cherry picked from commit 302a77a)
    @risicle
    risicle committed Jan 2, 2020
    Copy the full SHA
    c3f2b77 View commit details

Commits on Jan 4, 2020

  1. Merge pull request #76836 from risicle/ris-cyrus-sasl-CVE-2019-19906-… 

    …r19.09

[r19.09] cyrus_sasl: add patch for CVE-2019-19906
    @markuskowa
    markuskowa authored Jan 4, 2020
    Copy the full SHA
    5df05cb View commit details

Commits on Jan 8, 2020

  1. Merge branch 'staging-19.09' into release-19.09

    @vcunat
    vcunat committed Jan 8, 2020
    Copy the full SHA
    6758424 View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/development/libraries/cyrus-sasl/default.nix
7 changes: 6 additions & 1 deletion pkgs/development/libraries/cyrus-sasl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext
, pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false
, buildPackages, pruneLibtoolFiles }:
, buildPackages, pruneLibtoolFiles, fetchpatch }:

with stdenv.lib;
stdenv.mkDerivation rec {
@@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
patches = [
./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
./cyrus-sasl-ac-try-run-fix.patch
(fetchpatch {
name = "CVE-2019-19906.patch";
url = "https://sources.debian.org/data/main/c/cyrus-sasl2/2.1.27+dfsg-1+deb10u1/debian/patches/0021-CVE-2019-19906.patch";
sha256 = "1n4c5wg7l9j8rlbvx8i605j5d39xmj5wm618k8acxl4fmglcmfls";
})
];

configureFlags = [