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

Commits on Sep 5, 2017

  1. advancecomp: 1.23 -> 2.0

    @fpletz
    fpletz committed Sep 5, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    minijackson Rémi NICOLE
    GPG key ID: FEA888C9F5D64F62
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a5e9a31 View commit details

  2. asterisk-stble: 14.6.0 -> 14.6.1

    @fpletz
    fpletz committed Sep 5, 2017
    Copy the full SHA
    abba0b1 View commit details

  3. asterisk-lts: 13.15.0 -> 13.17.1

    @fpletz
    fpletz committed Sep 5, 2017
    Copy the full SHA
    9d74250 View commit details

  4. aptly: 1.0.1 -> 1.1.1

    @fpletz
    fpletz committed Sep 5, 2017
    Copy the full SHA
    f8ff9a7 View commit details

  5. tcpdump: fix multiple CVEs 

    Fixes CVE-2017-11541, CVE-2017-11542, CVE-2017-11543.

Also fixes a segfault if built with openssl 1.1.
    @fpletz
    fpletz committed Sep 5, 2017
    Copy the full SHA
    a46f206 View commit details
Showing with 29 additions and 10 deletions.
  1. +4 −4 pkgs/servers/asterisk/default.nix
  2. +2 −2 pkgs/tools/compression/advancecomp/default.nix
  3. +3 −3 pkgs/tools/misc/aptly/default.nix
  4. +20 −1 pkgs/tools/networking/tcpdump/default.nix
8 changes: 4 additions & 4 deletions pkgs/servers/asterisk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -88,17 +88,17 @@ in
{

asterisk-lts = common {
version = "13.15.0";
sha256 = "0i2qzfa1iyh66nma39kdigb9lp5gz3sn46znd2djz24wgmamb2lb";
version = "13.17.1";
sha256 = "0d7vqpkz0wv8d17vi7qxs9j7dbqwf4n80s411qva030hljcmdqdf";
externals = {
"externals_cache/pjproject-2.6.tar.bz2" = pjproject-26;
"addons/mp3" = mp3-202;
};
};

asterisk-stable = common {
version = "14.6.0";
sha256 = "1d3jjdapfv169d8yhfi92j75iwk9726brv1rjjy288d47jn3sm26";
version = "14.6.1";
sha256 = "0xg26p8rx9gw1ym9xdnpxr7bqp0kp76afy7f4ywmh25ki41inz08";
externals = {
"externals_cache/pjproject-2.6.tar.bz2" = pjproject-26;
"addons/mp3" = mp3-202;
4 changes: 2 additions & 2 deletions pkgs/tools/compression/advancecomp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
name = "advancecomp-${version}";
version = "1.23";
version = "2.0";

src = fetchFromGitHub {
owner = "amadvance";
repo = "advancecomp";
rev = "v${version}";
sha256 = "1mrgmpjd9f7x16g847h1588mgryl26hlzfl40bc611259bb0bq7w";
sha256 = "1lvrcxcxbxac47j0ml11nikx38zan7bbr3dfjssm52r5v4cmh8j9";
};

nativeBuildInputs = [ autoreconfHook ];
6 changes: 3 additions & 3 deletions pkgs/tools/misc/aptly/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,18 +2,18 @@

let

version = "1.0.1";
version = "1.1.1";
rev = "v${version}";

aptlySrc = fetchFromGitHub {
inherit rev;
owner = "smira";
repo = "aptly";
sha256 = "0rqxdhy2mlwndxhqb447gz626q92zd09rpvhysr2g1rx9nxa039p";
sha256 = "197a7nh8li20slqxgn8s8xm13x5b8ansmabk8rx32sngb73hp4av";
};

aptlyCompletionSrc = fetchFromGitHub {
rev = version;
rev = "1.0.1";
owner = "aptly-dev";
repo = "aptly-bash-completion";
sha256 = "0dkc4z687yk912lpv8rirv0nby7iny1zgdvnhdm5b47qmjr1sm5q";
21 changes: 20 additions & 1 deletion pkgs/tools/networking/tcpdump/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libpcap, enableStatic ? false
{ stdenv, fetchFromGitHub, fetchpatch, libpcap, enableStatic ? false
, hostPlatform
}:

@@ -13,6 +13,25 @@ stdenv.mkDerivation rec {
sha256 = "1vzrvn1q7x28h18yskqc390y357pzpg5xd3pzzj4xz3llnvsr64p";
};

patches = [
(fetchpatch {
url = "http://www.tcpdump.org/pre-4.9.2/PUBLISHED-CVE-2017-11541.patch";
sha256 = "1lqg4lbyddnv75wpj0rs2sxz4lb3d1vp8n385i27mrpcxw9qaxia";
})
(fetchpatch {
url = "http://www.tcpdump.org/pre-4.9.2/PUBLISHED-CVE-2017-11542.patch";
sha256 = "0vqgmw9i5vr3d4siyrh8mw60jdmp5r66rbjxfmbnwhlfjf4bwxz4";
})
(fetchpatch {
url = "http://www.tcpdump.org/pre-4.9.2/PUBLISHED-CVE-2017-11543.patch";
sha256 = "1vk9ncpx0qjja8l69xw5kkvgy9fkcii2n98diazv1yndln2cs26l";
})
(fetchpatch {
url = "http://www.tcpdump.org/pre-4.9.2/PUBLISHED-OpenSSL-1.1-segfault.patch";
sha256 = "0mw0jdj5nyg4sviqj7wxwf2492b2bdqmjrvf1k34ak417xfcvy1d";
})
];

buildInputs = [ libpcap ];

crossAttrs = {