Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f4fcdac99fa1
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3cd79ef30fbd
Choose a head ref
  • 5 commits
  • 3 files changed
  • 4 contributors

Commits on Jul 11, 2019

  1. atlassian-jira: 8.1.0 -> 8.1.2

    Johan Thomsen committed Jul 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9d1f4e5 View commit details

Commits on Jul 14, 2019

  1. squid4: add patch fixing CVE-2019-13345

    @risicle
    risicle committed Jul 14, 2019
    Copy the full SHA
    c62d44b View commit details

  2. squid: add patch fixing CVE-2019-13345

    @risicle
    risicle committed Jul 14, 2019
    Copy the full SHA
    db68273 View commit details

Commits on Jul 15, 2019

  1. Merge pull request #64745 from risicle/ris-squid-CVE-2019-13345-r19.03 

    [r19.03] squid, squid4: add patches fixing CVE-2019-13345
    @7c6f434c
    7c6f434c authored Jul 15, 2019
    Copy the full SHA
    0d0cb24 View commit details

  2. Merge pull request #64638 from johanot/jira-8.1.2 

    atlassian-jira: 8.1.0 -> 8.1.2
    @globin
    globin authored Jul 15, 2019
    Copy the full SHA
    3cd79ef View commit details
Showing with 20 additions and 4 deletions.
  1. +2 −2 pkgs/servers/atlassian/jira.nix
  2. +9 −1 pkgs/servers/squid/4.nix
  3. +9 −1 pkgs/servers/squid/default.nix
4 changes: 2 additions & 2 deletions pkgs/servers/atlassian/jira.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
name = "atlassian-jira-${version}";
version = "8.1.0";
version = "8.1.2";

src = fetchurl {
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "0mi1xknly44haf7gls3k212fx1dsl8k35rq82a1b3zj27kynwqr3";
sha256 = "040x4fh8qqhpzgqk25phfkq86vwph9diy871k0dflkmb5ccq5nx6";
};

phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
10 changes: 9 additions & 1 deletion pkgs/servers/squid/4.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
, expat, libxml2, openssl }:
, expat, libxml2, openssl, fetchpatch }:

stdenv.mkDerivation rec {
name = "squid-4.4";
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "10pfx44mps5ng1806rqdwx8jv8b2n25kjvx37dcd4x2mgzdfc1a9";
};

patches = [
(fetchpatch {
name = "4.x-CVE-2019-13345.patch";
url = "https://github.com/squid-cache/squid/commit/be1dc8614e7514103ba84d4067ed6fd15ab8f82e.patch";
sha256 = "0vqbnkib695xk5cvldrh993k8387rpghxw3x94la8mq3w7lga9m3";
})
];

buildInputs = [
perl openldap db cyrus_sasl expat libxml2 openssl
] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ];
10 changes: 9 additions & 1 deletion pkgs/servers/squid/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
, expat, libxml2, openssl }:
, expat, libxml2, openssl, fetchpatch }:

stdenv.mkDerivation rec {
name = "squid-3.5.28";
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "1n4f55g56b11qz4fazrnvgzx5wp6b6637c4qkbd1lrjwwqibchgx";
};

patches = [
(fetchpatch {
name = "3.5-CVE-2019-13345.patch";
url = "https://github.com/squid-cache/squid/commit/5730c2b5cb56e7639dc423dd62651c8736a54e35.patch";
sha256 = "0955432g9a00vwxzcrwpjzx6vywspx1cxhr7bknr7jzbzam5sxi3";
})
];

buildInputs = [
perl openldap db cyrus_sasl expat libxml2 openssl
] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ];