git.iko.soy/typeable/nixpkgs
on master help sign in
subversion: 1.12.2 -> 1.14.1
commit1e7720531aab24693775500065c80f54c8b13176 authorajs124 <git@ajs124.de> dateMon 26 Apr 2021, 02:43 (6 years ago) parente097d99
2 files changed+6−22
pkgs/applications/version-management/subversion/CVE-2020-17525.patch−15 pkgs/applications/version-management/subversion/default.nix+6−7
pkgs/applications/version-management/subversion/CVE-2020-17525.patchdeleted−15
@@ -1,15 +0,0 @@
1−Patch included in advisory @ https://subversion.apache.org/security/CVE-2020-17525-advisory.txt
2−
3−--- a/subversion/libsvn_repos/config_file.c
4−+++ b/subversion/libsvn_repos/config_file.c
5−@@ -237,6 +237,10 @@ get_repos_config(svn_stream_t **stream,
6− {
7− /* Search for a repository in the full path. */
8− repos_root_dirent = svn_repos_find_root_path(dirent, scratch_pool);
9−+ if (repos_root_dirent == NULL)
10−+ return svn_error_trace(handle_missing_file(stream, checksum, access,
11−+ url, must_exist,
12−+ svn_node_none));
13−
14− /* Attempt to open a repository at repos_root_dirent. */
15− SVN_ERR(svn_repos_open3(&access->repos, repos_root_dirent, NULL,
pkgs/applications/version-management/subversion/default.nix+6−7
@@ -6,13 +6,13 @@
66, javahlBindings ? false
77, saslSupport ? false
88, lib, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc
9−, apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
9+, apacheHttpd ? null, expat, swig ? null, jdk ? null, python3 ? null, py3c ? null, perl ? null
1010, sasl ? null, serf ? null
1111}:
1212
1313assert bdbSupport -> aprutil.bdbSupport;
1414assert httpServer -> apacheHttpd != null;
15−assert pythonBindings -> swig != null && python != null;
15+assert pythonBindings -> swig != null && python3 != null && py3c != null;
1616assert javahlBindings -> jdk != null && perl != null;
1717
1818let
@@ -31,7 +31,7 @@ let
3131
3232 buildInputs = [ zlib apr aprutil sqlite openssl lz4 utf8proc ]
3333 ++ lib.optional httpSupport serf
34− ++ lib.optional pythonBindings python
34+ ++ lib.optionals pythonBindings [ python3 py3c ]
3535 ++ lib.optional perlBindings perl
3636 ++ lib.optional saslSupport sasl;
3737
@@ -91,7 +91,7 @@ let
9191
9292 enableParallelBuilding = true;
9393
94− checkInputs = [ python ];
94+ checkInputs = [ python3 ];
9595 doCheck = false; # fails 10 out of ~2300 tests
9696
9797 meta = with lib; {
@@ -116,8 +116,7 @@ in {
116116 };
117117
118118 subversion = common {
119− version = "1.12.2";
120− sha256 = "0wgpw3kzsiawzqk4y0xgh1z93kllxydgv4lsviim45y5wk4bbl1v";
121− extraPatches = [ ./CVE-2020-17525.patch ];
119+ version = "1.14.1";
120+ sha256 = "1ag1hvcm9q92kgalzbbgcsq9clxnzmbj9nciz9lmabjx4lyajp9c";
122121 };
123122}