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: 82a441d3cfcc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ee06b3047ee9
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Jul 30, 2020

  1. graylog: 3.3.2 -> 3.3.3

    Bumps Graylog and integrations plugins to 3.3.3 which fixes CVE-2020-15813
    Tristan Helmich (omniIT) committed Jul 30, 2020
    Copy the full SHA
    1bb1b67 View commit details
  2. doc/rl-2009: Add warning on Graylog changes in version 3.3.3

    Tristan Helmich (omniIT) committed Jul 30, 2020
    Copy the full SHA
    70be15c View commit details
  3. Merge pull request #94253 from fadenb/graylog_3.3.3

    graylog: 3.3.2 -> 3.3.3
    Ma27 authored Jul 30, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ee06b30 View commit details
Showing with 12 additions and 6 deletions.
  1. +6 −0 nixos/doc/manual/release-notes/rl-2009.xml
  2. +2 −2 pkgs/tools/misc/graylog/default.nix
  3. +4 −4 pkgs/tools/misc/graylog/plugins.nix
6 changes: 6 additions & 0 deletions nixos/doc/manual/release-notes/rl-2009.xml
Original file line number Diff line number Diff line change
@@ -561,6 +561,12 @@ services.bitcoind."example-mainnet" = {
</programlisting>
</para>
</listitem>
<listitem>
<para>
Graylog introduced a change in the LDAP server certificate validation behaviour for version 3.3.3 which might break existing setups.
When updating Graylog from a version before 3.3.3 make sure to check the Graylog <link xlink:href="https://www.graylog.org/post/announcing-graylog-v3-3-3">release info</link> for information on how to avoid the issue.
</para>
</listitem>
</itemizedlist>
</section>

4 changes: 2 additions & 2 deletions pkgs/tools/misc/graylog/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "graylog";
version = "3.3.2";
version = "3.3.3";

src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
sha256 = "0mw0nwj6i681bfsp3psjq377bha2qskkw955pp9h1p8xdyy8cx32";
sha256 = "1yc2rirbdydirs1kph60acz06ciqnjbf115p3q4vhh15l84lg3sg";
};

dontBuild = true;
8 changes: 4 additions & 4 deletions pkgs/tools/misc/graylog/plugins.nix
Original file line number Diff line number Diff line change
@@ -64,10 +64,10 @@ in {
enterprise-integrations = glPlugin rec {
name = "graylog-enterprise-integrations-${version}";
pluginName = "graylog-plugin-enterprise-integrations";
version = "3.3.1";
version = "3.3.3";
src = fetchurl {
url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz";
sha256 = "0la91f5hfakrp5d37q3r1z15zzya9vmwgp8gf5ifkh6fasa811ll";
sha256 = "14b8whgvx8lzil09gjjxhps5syw3slwbh3gswrgc9kh1sqmdhl85";
};
installPhase = ''
mkdir -p $out/bin
@@ -96,10 +96,10 @@ in {
integrations = glPlugin rec {
name = "graylog-integrations-${version}";
pluginName = "graylog-plugin-integrations";
version = "3.3.1";
version = "3.3.3";
src = fetchurl {
url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz";
sha256 = "1k90q50p4ly9d8fj0riyb1xw0bd6f8wm2xmkr71908j2v0jaskpq";
sha256 = "1zf97q8xm81z6q2s7c3nwvpl1m6pc6w7zjm4hmd7ds1br6pg4bdh";
};
installPhase = ''
mkdir -p $out/bin