diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-11-19 17:38:04 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-11-19 17:39:37 +0100 |
| commit | 0426b9456eecaf1036b8b99e10cc2d0e641d347d (patch) | |
| tree | 43ec06b175372a7323afb8ef6e29590ad6d0c3be /pkgs/servers/http/couchdb | |
| parent | 71b8437e2c6169210fdc1d528240c8b1ea0193ac (diff) | |
couchdb: 1.6.1 -> 1.7.1 for multiple CVEs
Fixes CVE-2017-12635, CVE-2017-12636.
https://blog.couchdb.org/2017/11/14/apache-couchdb-cve-2017-12635-and-cve-2017-12636/
Diffstat (limited to 'pkgs/servers/http/couchdb')
| -rw-r--r-- | pkgs/servers/http/couchdb/default.nix | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 5a988d22ecb6..43334819dc56 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -3,30 +3,18 @@ stdenv.mkDerivation rec { name = "couchdb-${version}"; - version = "1.6.1"; + version = "1.7.1"; src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; - sha256 = "09w6ijj9l5jzh81nvc3hrlqp345ajg3haj353g9kxkik6wbinq2s"; + sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i"; }; - buildInputs = [ erlang icu openssl spidermonkey curl help2man sphinx which - file pkgconfig ]; - - /* This patch removes the `-Werror` flag as there are warnings due to - * _BSD_SOURCE being deprecated in glibc >= 2.20 - */ - patchPhase = '' - patch src/couchdb/priv/Makefile.in <<EOF - 392c392 - < couchjs_CFLAGS = -g -Wall -Werror -D_BSD_SOURCE \$(CURL_CFLAGS) \$(JS_CFLAGS) - --- - > couchjs_CFLAGS = -g -Wall -D_BSD_SOURCE \$(CURL_CFLAGS) \$(JS_CFLAGS) - EOF - ''; + nativeBuildInputs = [ help2man which file pkgconfig sphinx ]; + buildInputs = [ erlang icu openssl spidermonkey curl ]; postInstall = '' - sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb + substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt" ''; /* |