git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #120731 from helsinki-systems/upd/subversion

subversion: 1.12.2 -> 1.14.1

commite1ff5c3d8c4ca7101f2c820f85d8290303deaa53 authorRobert Schütz <dev@schuetz-co.de> dateThu 29 Apr 2021, 19:36 (6 years ago) parentff7d6c91e77205
4 files changed+39−22
pkgs/applications/version-management/subversion/CVE-2020-17525.patch−15 pkgs/applications/version-management/subversion/default.nix+6−7 pkgs/development/libraries/py3c/default.nix+31 pkgs/top-level/all-packages.nix+2
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}
pkgs/development/libraries/py3c/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ lib, stdenv, fetchFromGitHub, python2, python3 }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "py3c";
5+ version = "1.3.1";
6+
7+ src = fetchFromGitHub {
8+ owner = "encukou";
9+ repo = pname;
10+ rev = "v${version}";
11+ sha256 = "04i2z7hrig78clc59q3i1z2hh24g7z1bfvxznlzxv00d4s57nhpi";
12+ };
13+
14+ makeFlags = [
15+ "prefix=${placeholder "out"}"
16+ ];
17+
18+ doCheck = true;
19+
20+ checkInputs = [
21+ python2
22+ python3
23+ ];
24+
25+ meta = with lib; {
26+ homepage = "https://github.com/encukou/py3c";
27+ description = "Python 2/3 compatibility layer for C extensions";
28+ license = licenses.mit;
29+ maintainers = with maintainers; [ ajs124 ];
30+ };
31+}
pkgs/top-level/all-packages.nix+2
@@ -12028,6 +12028,8 @@ in
1202812028 pypy27Packages = pypy27.pkgs;
1202912029 pypy3Packages = pypy3.pkgs;
1203012030
12031+ py3c = callPackage ../development/libraries/py3c { };
12032+
1203112033 pythonManylinuxPackages = callPackage ./../development/interpreters/python/manylinux { };
1203212034
1203312035 update-python-libraries = callPackage ../development/interpreters/python/update-python-libraries { };