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: 4ca4d6afca23
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 536ab403d49f
Choose a head ref
  • 6 commits
  • 6 files changed
  • 1 contributor

Commits on Sep 28, 2017

  1. mpg123: 1.25.4 -> 1.25.7 for multiple CVEs 

    Fixes at least CVE-2017-10683, CVE-2017-11126, CVE-2017-9545,
CVE-2017-12797.
    @fpletz
    fpletz committed Sep 28, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6c283ae View commit details

  2. postfix: 3.1.3 -> 3.2.3 

    Possibly fixes security issues. No CVE yet.
    @fpletz
    fpletz committed Sep 28, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    14e53aa View commit details

  3. augeas: 1.8.0 -> 1.8.1 for CVE-2017-7555

    @fpletz
    fpletz committed Sep 28, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d2b6e9c View commit details

  4. fossil: 2.2 -> 2.3 

    Fixes XSS vulnerability on the /help webpage. No CVE known.
    @fpletz
    fpletz committed Sep 28, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    faed026 View commit details

  5. ettercap: fix CVE-2017-8366 & CVE-2017-6430

    @fpletz
    fpletz committed Sep 28, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b29051b View commit details

  6. qemu: 2.9.0 -> 2.9.1 

    Security and bugfix release.
    @fpletz
    fpletz committed Sep 28, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    536ab40 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/audio/mpg123/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
}:

stdenv.mkDerivation rec {
name = "mpg123-1.25.4";
name = "mpg123-1.25.7";

src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
sha256 = "1rxknrnl3ji5hi5rbckpzhbl1k5r8i53kcys4xdgg0xbi8765dfd";
sha256 = "1ws40fglyyk51jvmz8gfapjkw1g51pkch1rffdsbh4b1yay5xc9i";
};

buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
18 changes: 16 additions & 2 deletions pkgs/applications/networking/sniffers/ettercap/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre,
openssl, ncurses, glib, gtk2, atk, pango, flex, bison }:
{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre
, openssl, ncurses, glib, gtk2, atk, pango, flex, bison
, fetchpatch }:

stdenv.mkDerivation rec {
name = "ettercap-${version}";
@@ -12,6 +13,19 @@ stdenv.mkDerivation rec {
sha256 = "1kvrzv2f8kxy7pndfadkzv10cs5wsyfkaa1ski20r2mq4wrvd0cd";
};

patches = [
(fetchpatch {
name = "CVE-2017-8366.patch";
url = "https://github.com/Ettercap/ettercap/commit/1083d604930ebb9f350126b83802ecd2cbc17f90.patch";
sha256 = "1ff6fp8fxisvd3fkkd01y4fjykgcj414kczzpfscdmi52ridwg8m";
})
(fetchpatch {
name = "CVE-2017-6430.patch";
url = "https://github.com/Ettercap/ettercap/commit/7f50c57b2101fe75592c8dc9960883bbd1878bce.patch";
sha256 = "0s13nc9yzxzp611rixsd1c8aw1b57q2lnvfq8wawxyrw07h7b2j4";
})
];

buildInputs = [
cmake libpcap libnet zlib curl pcre openssl ncurses
glib gtk2 atk pango flex bison
9 changes: 5 additions & 4 deletions pkgs/applications/version-management/fossil/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,16 @@
, tcllib, withJson ? true}:

stdenv.mkDerivation rec {
name = "fossil-2.2";
name = "fossil-${version}";
version = "2.3";

src = fetchurl {
urls =
urls =
[
https://www.fossil-scm.org/index.html/uv/fossil-src-2.2.tar.gz
"https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
];
name = "${name}.tar.gz";
sha256 = "0wfgacfg29dkl0c3l1rp5ji0kraa64gcbg5lh8p4m7mqdqcq53wv";
sha256 = "0paalvb4rdyr79v6rwspaha5n4dqb92df9irijha13m3apsanwzh";
};

buildInputs = [ zlib openssl readline sqlite which ed ]
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/qemu/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@

with stdenv.lib;
let
version = "2.9.0";
version = "2.9.1";
audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+ optionalString pulseSupport "pa,"
+ optionalString sdlSupport "sdl,";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
sha256 = "053c7ivp3li7cdagzkp2wdc5myybzjf826r6qfkcf0xvn4bv5gq0";
sha256 = "1340hh4jvhvi97yqck408wi8aagnhzq1311ih0fq9bp4ddlk03sd";
};

buildInputs =
4 changes: 2 additions & 2 deletions pkgs/servers/mail/postfix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -25,11 +25,11 @@ in stdenv.mkDerivation rec {

name = "postfix-${version}";

version = "3.1.3";
version = "3.2.3";

src = fetchurl {
url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
sha256 = "0ya9h7ynhq8h7zgq0qkvfwx5rsam7i3vkbyh6rx63qlpcxz15y2j";
sha256 = "1gs025smgynrlsg44cypjam99ds92mc9q46l5085d9sy0xfrf2sv";
};

buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu pcre ]
4 changes: 2 additions & 2 deletions pkgs/tools/system/augeas/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "augeas-${version}";
version = "1.8.0";
version = "1.8.1";

src = fetchurl {
url = "http://download.augeas.net/${name}.tar.gz";
sha256 = "1iac5lwi1q10r343ii9v5p2fdplvh06yv9svsi8zz6cd2c2fjp2i";
sha256 = "1yf93fqwav1zsl8dpyfkf0g11w05mmfckqy6qsjy5zkklnspbkv5";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ readline libxml2 ];