Skip to content

Commit fa824e6

Browse files
fpletzfpletz
committedNov 19, 2017
Merge branch 'master' into staging
2 parents 5a53a80 + c46d4da commit fa824e6

File tree

29 files changed

+300
-361
lines changed

29 files changed

+300
-361
lines changed
 

‎nixos/modules/services/x11/display-managers/gdm.nix

-3
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,8 @@ in
122122
"rc-local.service"
123123
"systemd-machined.service"
124124
"systemd-user-sessions.service"
125-
"getty@tty1.service"
126125
];
127126

128-
systemd.services."getty@tty1".enable = false;
129-
systemd.services.display-manager.conflicts = [ "getty@tty1.service" ];
130127
systemd.services.display-manager.serviceConfig = {
131128
# Restart = "always"; - already defined in xserver.nix
132129
KillMode = "mixed";

‎nixos/release.nix

+1
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ in rec {
235235
tests.containers-tmpfs = callTest tests/containers-tmpfs.nix {};
236236
tests.containers-hosts = callTest tests/containers-hosts.nix {};
237237
tests.containers-macvlans = callTest tests/containers-macvlans.nix {};
238+
tests.couchdb = callTest tests/couchdb.nix {};
238239
tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
239240
tests.docker-edge = hydraJob (import tests/docker-edge.nix { system = "x86_64-linux"; });
240241
tests.dovecot = callTest tests/dovecot.nix {};

‎nixos/tests/couchdb.nix

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
import ./make-test.nix ({ pkgs, lib, ...}:
2+
3+
with lib;
4+
5+
{
6+
name = "couchdb";
7+
meta = with pkgs.stdenv.lib.maintainers; {
8+
maintainers = [ fpletz ];
9+
};
10+
11+
nodes = {
12+
couchdb1 =
13+
{ pkgs, config, ... }:
14+
15+
{ environment.systemPackages = with pkgs; [ jq ];
16+
services.couchdb.enable = true;
17+
};
18+
19+
couchdb2 =
20+
{ pkgs, config, ... }:
21+
22+
{ environment.systemPackages = with pkgs; [ jq ];
23+
services.couchdb.enable = true;
24+
services.couchdb.package = pkgs.couchdb2;
25+
};
26+
};
27+
28+
testScript = let
29+
curlJqCheck = action: path: jqexpr: result:
30+
pkgs.writeScript "curl-jq-check-${action}-${path}.sh" ''
31+
RESULT=$(curl -X ${action} http://127.0.0.1:5984/${path} | jq -r '${jqexpr}')
32+
echo $RESULT >&2
33+
if [ "$RESULT" != "${result}" ]; then
34+
exit 1
35+
fi
36+
'';
37+
in ''
38+
startAll;
39+
40+
$couchdb1->waitForUnit("couchdb.service");
41+
$couchdb1->waitUntilSucceeds("${curlJqCheck "GET" "" ".couchdb" "Welcome"}");
42+
$couchdb1->waitUntilSucceeds("${curlJqCheck "GET" "_all_dbs" ". | length" "2"}");
43+
$couchdb1->succeed("${curlJqCheck "PUT" "foo" ".ok" "true"}");
44+
$couchdb1->succeed("${curlJqCheck "GET" "_all_dbs" ". | length" "3"}");
45+
$couchdb1->succeed("${curlJqCheck "DELETE" "foo" ".ok" "true"}");
46+
$couchdb1->succeed("${curlJqCheck "GET" "_all_dbs" ". | length" "2"}");
47+
48+
$couchdb2->waitForUnit("couchdb.service");
49+
$couchdb2->waitUntilSucceeds("${curlJqCheck "GET" "" ".couchdb" "Welcome"}");
50+
$couchdb2->waitUntilSucceeds("${curlJqCheck "GET" "_all_dbs" ". | length" "0"}");
51+
$couchdb2->succeed("${curlJqCheck "PUT" "foo" ".ok" "true"}");
52+
$couchdb2->succeed("${curlJqCheck "GET" "_all_dbs" ". | length" "1"}");
53+
$couchdb2->succeed("${curlJqCheck "DELETE" "foo" ".ok" "true"}");
54+
$couchdb2->succeed("${curlJqCheck "GET" "_all_dbs" ". | length" "0"}");
55+
'';
56+
})

‎pkgs/applications/editors/geany/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
with stdenv.lib;
44

55
let
6-
version = "1.31";
6+
version = "1.32";
77
in
88

99
stdenv.mkDerivation rec {
1010
name = "geany-${version}";
1111

1212
src = fetchurl {
1313
url = "http://download.geany.org/${name}.tar.bz2";
14-
sha256 = "30fdb906bb76c4251a8bcf83ee267db28c26ef6ab867668a782cec1164a3aba5";
14+
sha256 = "8b7be10b95d0614eb07f845ba2280f7c026eacd5739d8fac4d5d26606f8c3c2d";
1515
};
1616

1717
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;

‎pkgs/applications/networking/cluster/minikube/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, kubernetes, libvirt, qemu, docker-machine-kvm,
2-
gpgme, makeWrapper }:
2+
gpgme, makeWrapper, hostPlatform, vmnet }:
33

44
let
55
binPath = [ kubernetes ]
@@ -36,7 +36,7 @@ in buildGoPackage rec {
3636

3737
# kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly
3838
# that kubectl is on the $PATH, even if it doesn't use it at all to generate the completions
39-
buildInputs = [ go-bindata makeWrapper kubernetes gpgme ];
39+
buildInputs = [ go-bindata makeWrapper kubernetes gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet;
4040
subPackages = [ "cmd/minikube" ];
4141

4242
preBuild = ''

‎pkgs/applications/networking/corebird/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
, glib_networking }:
44

55
stdenv.mkDerivation rec {
6-
version = "1.7.1";
6+
version = "1.7.2";
77
name = "corebird-${version}";
88

99
src = fetchFromGitHub {
1010
owner = "baedert";
1111
repo = "corebird";
1212
rev = version;
13-
sha256 = "1g6wkzrl6j0mmgafpv0jpqa906s1x7p5hmiqdgs9qwm7q2wlwrqd";
13+
sha256 = "0mydxxga4h1663xchb3543rk3k8frlmlyy5wz20zh38fpdlkhyf1";
1414
};
1515

1616
preConfigure = ''

‎pkgs/applications/networking/gmailieer/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
python3Packages.buildPythonApplication rec {
44
name = "gmailieer";
5-
version = "0.3";
5+
version = "0.4";
66

77
src = fetchFromGitHub {
88
owner = "gauteh";
99
repo = "gmailieer";
1010
rev = "v${version}";
11-
sha256 = "1app783gf0p9p196nqsgbyl6s1bp304dfav86fqiq86h1scld787";
11+
sha256 = "0vpc8nrh3cx91pcw45jjr2jllkqbx6w2khq7nyqv59gc4q5mz0p2";
1212
};
1313

1414
propagatedBuildInputs = with python3Packages; [

‎pkgs/applications/networking/mailreaders/notmuch/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
with stdenv.lib;
1313

1414
stdenv.mkDerivation rec {
15-
version = "0.25";
15+
version = "0.25.2";
1616
name = "notmuch-${version}";
1717

1818
passthru = {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222

2323
src = fetchurl {
2424
url = "http://notmuchmail.org/releases/${name}.tar.gz";
25-
sha256 = "02z6d87ip1hkipz8d7w0sfklg8dd5fd5vlgp768640ixg0gqvlk5";
25+
sha256 = "0ai6vbs9wzwfz7jcphgqsqpcbq137l34xhmcli4h5c8n82fvmdp4";
2626
};
2727

2828
nativeBuildInputs = [ pkgconfig ];

‎pkgs/desktops/gnome-3/core/gdm/default.nix

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
1414
configureFlags = [ "--sysconfdir=/etc"
1515
"--localstatedir=/var"
1616
"--with-plymouth=yes"
17+
"--with-initial-vt=7"
1718
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
1819

1920
nativeBuildInputs = [ autoreconfHook pkgconfig ];

‎pkgs/development/libraries/audiofile/default.nix

+51-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
{ stdenv, fetchurl, alsaLib, AudioUnit, CoreServices }:
1+
{ stdenv, fetchurl, fetchpatch, alsaLib, AudioUnit, CoreServices }:
2+
3+
let
4+
5+
fetchDebianPatch = { name, debname, sha256 }:
6+
fetchpatch {
7+
inherit sha256 name;
8+
url = "https://anonscm.debian.org/cgit/pkg-multimedia/audiofile.git/plain/debian/patches/${debname}?h=debian/0.3.6-4";
9+
};
10+
11+
in
212

313
stdenv.mkDerivation rec {
414
name = "audiofile-0.3.6";
@@ -15,7 +25,46 @@ stdenv.mkDerivation rec {
1525
sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind";
1626
};
1727

18-
patches = [ ./CVE-2015-7747.patch ./gcc-6.patch ];
28+
patches = [
29+
./gcc-6.patch
30+
./CVE-2015-7747.patch
31+
32+
(fetchDebianPatch {
33+
name = "CVE-2017-6829.patch";
34+
debname = "04_clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch";
35+
sha256 = "04qxl51i64c53v69q2kx61qdq474f4vapk8rq97cipj7yrar392m";
36+
})
37+
(fetchDebianPatch {
38+
name = "CVE-2017-6827+CVE-2017-6828+CVE-2017-6832+CVE-2017-6835+CVE-2017-6837.patch";
39+
debname = "05_Always-check-the-number-of-coefficients.patch";
40+
sha256 = "1ih03kfkabffi6ymp6832q470i28rsds78941vzqlshnqjb2nnxw";
41+
})
42+
(fetchDebianPatch {
43+
name = "CVE-2017-6839.patch";
44+
debname = "06_Check-for-multiplication-overflow-in-MSADPCM-decodeSam.patch";
45+
sha256 = "0a8s2z8rljlj03p7l1is9s4fml8vyzvyvfrh1m6xj5a8vbi635d0";
46+
})
47+
(fetchDebianPatch {
48+
name = "CVE-2017-6830+CVE-2017-6834+CVE-2017-6836+CVE-2017-6838.patch";
49+
debname = "07_Check-for-multiplication-overflow-in-sfconvert.patch";
50+
sha256 = "0rfba8rkasl5ycvc0kqlzinkl3rvyrrjvjhpc45h423wmjk2za2l";
51+
})
52+
(fetchDebianPatch {
53+
name = "audiofile-fix-multiplyCheckOverflow-signature.patch";
54+
debname = "08_Fix-signature-of-multiplyCheckOverflow.-It-returns-a-b.patch";
55+
sha256 = "032p5jqp7q7jgc5axdnazz00zm7hd26z6m5j55ifs0sykr5lwldb";
56+
})
57+
(fetchDebianPatch {
58+
name = "CVE-2017-6831.patch";
59+
debname = "09_Actually-fail-when-error-occurs-in-parseFormat.patch";
60+
sha256 = "0csikmj8cbiy6cigg0rmh67jrr0sgm56dfrnrxnac3m9635nxlac";
61+
})
62+
(fetchDebianPatch {
63+
name = "CVE-2017-6833.patch";
64+
debname = "10_Check-for-division-by-zero-in-BlockCodec-runPull.patch";
65+
sha256 = "1rlislkjawq98bbcf1dgl741zd508wwsg85r37ca7pfdf6wgl6z7";
66+
})
67+
];
1968

2069
meta = with stdenv.lib; {
2170
description = "Library for reading and writing audio files in various formats";

‎pkgs/development/libraries/libsndfile/default.nix

+17-12
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,30 @@ stdenv.mkDerivation rec {
1111
};
1212

1313
patches = [
14-
# CVE-2017-12562
1514
(fetchurl {
16-
url = "https://github.com/erikd/libsndfile/commit/cf7a8182c2642c50f1cf90dddea9ce96a8bad2e8.patch";
17-
sha256 = "1jg3wq30wdn9nv52mcyv6jyi4d80h4r1h9p96czcria7l91yh4sy";
15+
name = "CVE-2017-12562.patch";
16+
url = "https://github.com/erikd/libsndfile/commit/cf7a8182c2642c50f1cf90dddea9ce96a8bad2e8.patch";
17+
sha256 = "1jg3wq30wdn9nv52mcyv6jyi4d80h4r1h9p96czcria7l91yh4sy";
1818
})
19-
# CVE-2017-6892
2019
(fetchurl {
21-
url = "https://github.com/erikd/libsndfile/commit/f833c53cb596e9e1792949f762e0b33661822748.patch";
22-
sha256 = "05xkmz2ihc1zcj73sbmj1ikrv9qlcym2bkp1v6ak7w53ky619mwq";
20+
name = "CVE-2017-6892.patch";
21+
url = "https://github.com/erikd/libsndfile/commit/f833c53cb596e9e1792949f762e0b33661822748.patch";
22+
sha256 = "05xkmz2ihc1zcj73sbmj1ikrv9qlcym2bkp1v6ak7w53ky619mwq";
2323
})
24-
# CVE-2017-8361, CVE-2017-8363, CVE-2017-8363
2524
(fetchurl {
26-
url = "https://github.com/erikd/libsndfile/commit/fd0484aba8e51d16af1e3a880f9b8b857b385eb3.patch";
27-
sha256 = "0ccndnvjzx5fw18zvy03vnb29rr81h5vsh1m16msqbxk8ibndln2";
25+
name = "CVE-2017-8361+CVE-2017-8363+CVE-2017-8365.patch";
26+
url = "https://github.com/erikd/libsndfile/commit/fd0484aba8e51d16af1e3a880f9b8b857b385eb3.patch";
27+
sha256 = "0ccndnvjzx5fw18zvy03vnb29rr81h5vsh1m16msqbxk8ibndln2";
2828
})
29-
# CVE-2017-8362
3029
(fetchurl {
31-
url = "https://github.com/erikd/libsndfile/commit/ef1dbb2df1c0e741486646de40bd638a9c4cd808.patch";
32-
sha256 = "1xyv30ga71cpy4wx5f76sc4dma91la2lcc6s9f3pk9rndyi7gj9x";
30+
name = "CVE-2017-8362.patch";
31+
url = "https://github.com/erikd/libsndfile/commit/ef1dbb2df1c0e741486646de40bd638a9c4cd808.patch";
32+
sha256 = "1xyv30ga71cpy4wx5f76sc4dma91la2lcc6s9f3pk9rndyi7gj9x";
33+
})
34+
(fetchurl {
35+
name = "CVE-2017-14634.patch";
36+
url = "https://github.com/erikd/libsndfile/commit/85c877d5072866aadbe8ed0c3e0590fbb5e16788.patch";
37+
sha256 = "0kc7vp22qsxidhvmlc6nfamw7k92n0hcfpmwhb3gaksjamwhb2df";
3338
})
3439
];
3540

‎pkgs/development/libraries/openjpeg/2.1.nix

+4-33
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,8 @@
11
{ callPackage, fetchpatch, ... } @ args:
22

33
callPackage ./generic.nix (args // rec {
4-
version = "2.1.2";
5-
branch = "2.1";
6-
revision = "v2.1.2";
7-
sha256 = "0kdcl9sqjz0vagli4ad6bxq1r8ma086m0prpkm5x3dxp37hpjp8h";
8-
9-
patches = [
10-
# Fetched from https://github.com/szukw000/openjpeg/commit/cadff5fb6e73398de26a92e96d3d7cac893af255
11-
# Referenced from https://bugzilla.redhat.com/show_bug.cgi?id=1405135
12-
# Put in our source code to make sure we don't lose it, since that
13-
# referenced commit is someone else's fork, and not actually up-stream.
14-
./CVE-2016-9580-and-CVE-2016-9581.patch
15-
16-
(fetchpatch {
17-
url = "https://bugzilla.suse.com/attachment.cgi?id=707359&action=diff&context=patch&collapsed=&headers=1&format=raw";
18-
name = "CVE-2016-9112.patch";
19-
sha256 = "18hqx73wdzfybr5n5k6pzhbhdlmawiqbjci8n82zykxiyfgp18pd";
20-
})
21-
(fetchpatch {
22-
url = "https://bugzilla.suse.com/attachment.cgi?id=707354&action=diff&context=patch&collapsed=&headers=1&format=raw";
23-
name = "CVE-2016-9114.patch";
24-
sha256 = "0qam3arw9kdbh4501xim2pyldl708dnpyjwvjmwc9gc7hcq4gfi3";
25-
})
26-
(fetchpatch {
27-
url = "https://bugzilla.suse.com/attachment.cgi?id=707356&action=diff&context=patch&collapsed=&headers=1&format=raw";
28-
name = "CVE-2016-9116.patch";
29-
sha256 = "0yyb3pxqi5sr44a48bacngzp206j4z49lzkg6hbkz1nra9na61a3";
30-
})
31-
(fetchpatch {
32-
url = "https://bugzilla.suse.com/attachment.cgi?id=707358&action=diff&context=patch&collapsed=&headers=1&format=raw";
33-
name = "CVE-2016-9118.patch";
34-
sha256 = "125n8bmh07y7697s0y82ypb39rxgj0bdn8rcywbvamscagwg2wy9";
35-
})
36-
];
4+
version = "2.3.0";
5+
branch = "2.3";
6+
revision = "v${version}";
7+
sha256 = "08plxrnfl33sn2vh5nwbsngyv6b1sfpplvx881crm1v1ai10m2lz";
378
})

0 commit comments

Comments
 (0)
Please sign in to comment.