b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

rsync: 3.2.3 -> 3.2.4

Browse source 
https://download.samba.org/pub/rsync/NEWS#3.2.4
This commit is contained in:
Thomas Gerbet 2022-05-27 11:00:35 +02:00 committed by ehmry
parent 41c7f85b39
commit 3de6800173
3 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/networking/sync/rsync/base.nix
View file

@ -1,24 +1,17 @@
{ lib, fetchurl, fetchpatch }:
rec {
version = "3.2.3";
version = "3.2.4";
src = fetchurl {
# signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
sha256 = "03p5dha9g9krq61mdbcrjkpz5nglri0009ks2vs9k97f9i83rk5y";
sha256 = "sha256-b3YYONCAUrC2V5z39nN9k+R/AfTaBMXSTTRHt/Kl+tE=";
};
upstreamPatchTarball = fetchurl {
# signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz";
sha256 = "1wj21v57v135n6fnmlm2dxmb9lhrrg62jgkggldp1gb7d6s4arny";
sha256 = "sha256-cKWXWQr2xhzz0F1mNCn/n2D/4k5E+cc6TNxp69wTIqQ=";
};
extraPatches = [
(fetchpatch {
name = "CVE-2020-14387.patch";
url = "https://git.samba.org/?p=rsync.git;a=patch;h=c3f7414;hp=4c4fce51072c9189cfb11b52aa54fed79f5741bd";
sha256 = "000lyx48lns84p53nsdlr45mb9558lrvnsz3yic0y3z6h2izv82x";
})
];
meta = with lib; {
description = "Fast incremental file transfer utility";

13
pkgs/applications/networking/sync/rsync/default.nix
View file

@ -32,8 +32,7 @@ stdenv.mkDerivation rec {
patchesSrc = base.upstreamPatchTarball;
srcs = [ mainSrc ] ++ lib.optional enableCopyDevicesPatch patchesSrc;
patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"
++ base.extraPatches;
patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
buildInputs = [ libiconv zlib popt ]
++ lib.optional enableACLs acl
@ -49,15 +48,7 @@ stdenv.mkDerivation rec {
# disable the included zlib explicitly as it otherwise still compiles and
# links them even.
"--with-included-zlib=no"
]
# Work around issue with cross-compilation:
# configure.sh: error: cannot run test program while cross compiling
# Remove once 3.2.4 or more recent is released.
# The following PR should fix the cross-compilation issue.
# Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`.
# https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no"
;
];
passthru.tests = { inherit (nixosTests) rsyncd; };

2
pkgs/applications/networking/sync/rsync/rrsync.nix
View file

@ -16,8 +16,6 @@ stdenv.mkDerivation {
dontConfigure = true;
dontBuild = true;
patches = base.extraPatches;
postPatch = ''
substituteInPlace support/rrsync --replace /usr/bin/rsync ${rsync}/bin/rsync
'';