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: aed81020ed09
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7833adb0ee76
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 19, 2019

  1. rsyslog: 8.1907.0 -> 8.1910.0 (#69954)

    * rsyslog: 8.1907.0 -> 8.1908.0
    
    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/rsyslog/versions
    
    * rsyslog: 8.1908.0 -> 8.1910.0
    
    Changelog:
    https://raw.githubusercontent.com/rsyslog/rsyslog/v8.1910.0/ChangeLog
    
    Security fix: CVE-2019-17040
    r-ryantm authored and c0bw3b committed Oct 19, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    thoughtpolice Austin Seipp
    Copy the full SHA
    7833adb View commit details
Showing with 5 additions and 3 deletions.
  1. +5 −3 pkgs/tools/system/rsyslog/default.nix
8 changes: 5 additions & 3 deletions pkgs/tools/system/rsyslog/default.nix
Original file line number Diff line number Diff line change
@@ -11,11 +11,12 @@ let
mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
in
stdenv.mkDerivation rec {
name = "rsyslog-8.1907.0";
pname = "rsyslog";
version = "8.1910.0";

src = fetchurl {
url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
sha256 = "1dcz0w5xalqsi2xjb5j7c9mq5kf9s9kq9j2inpv4w5wkrrg569zb";
url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz";
sha256 = "14qczsj12spx0m3dz1pkxnacwi5njr0syamnmi1rg8ri5xlyw682";
};

#patches = [ ./fix-gnutls-detection.patch ];
@@ -108,6 +109,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = https://www.rsyslog.com/;
description = "Enhanced syslog implementation";
changelog = "https://raw.githubusercontent.com/rsyslog/rsyslog/v${version}/ChangeLog";
license = licenses.gpl3;
platforms = platforms.linux;
};