rsync: 3.2.4 -> 3.2.5

This release fixes CVE-2022-29154:
https://download.samba.org/pub/rsync/NEWS#3.2.5

Remove enableCopyDevicesPatch because --copy-devices was included in rsync 3.2.4:
https://download.samba.org/pub/rsync/NEWS#3.2.4:~:text=Added%20the%20%2D%2Dcopy%2Ddevices%20option

authored by Ivan Kozik and committed by ehmry 457e2672 4cff5cf6

+7 -17
+6 -16
pkgs/applications/networking/sync/rsync/default.nix
··· 1 { lib 2 , stdenv 3 , fetchurl 4 - , fetchpatch 5 , perl 6 , libiconv 7 , zlib ··· 16 , xxHash 17 , enableZstd ? true 18 , zstd 19 - , enableCopyDevicesPatch ? false 20 , nixosTests 21 }: 22 23 stdenv.mkDerivation rec { 24 pname = "rsync"; 25 - version = "3.2.4"; 26 27 - srcs = [ 28 - (fetchurl { 29 - # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 30 - url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; 31 - sha256 = "sha256-b3YYONCAUrC2V5z39nN9k+R/AfTaBMXSTTRHt/Kl+tE="; 32 - }) 33 - ] ++ lib.optional enableCopyDevicesPatch (fetchurl { 34 # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 35 - url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; 36 - sha256 = "1wj21v57v135n6fnm2m2dxmb9lhrrg62jgkggldp1gb7d6s4arny"; 37 - }); 38 - 39 - patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; 40 41 nativeBuildInputs = [ perl ]; 42 ··· 64 homepage = "https://rsync.samba.org/"; 65 license = licenses.gpl3Plus; 66 platforms = platforms.unix; 67 - maintainers = with lib.maintainers; [ ehmry kampfschlaefer ]; 68 }; 69 }
··· 1 { lib 2 , stdenv 3 , fetchurl 4 , perl 5 , libiconv 6 , zlib ··· 15 , xxHash 16 , enableZstd ? true 17 , zstd 18 , nixosTests 19 }: 20 21 stdenv.mkDerivation rec { 22 pname = "rsync"; 23 + version = "3.2.5"; 24 25 + src = fetchurl { 26 # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 27 + url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; 28 + sha256 = "sha256-KsTSFjXN95GGe8N3w1ym3af1DZGaWL5FBX/VFgDGmro="; 29 + }; 30 31 nativeBuildInputs = [ perl ]; 32 ··· 54 homepage = "https://rsync.samba.org/"; 55 license = licenses.gpl3Plus; 56 platforms = platforms.unix; 57 + maintainers = with lib.maintainers; [ ehmry kampfschlaefer ivan ]; 58 }; 59 }
+1 -1
pkgs/applications/networking/sync/rsync/rrsync.nix
··· 2 3 stdenv.mkDerivation { 4 pname = "rrsync"; 5 - inherit (rsync) version srcs; 6 7 buildInputs = [ 8 rsync
··· 2 3 stdenv.mkDerivation { 4 pname = "rrsync"; 5 + inherit (rsync) version src; 6 7 buildInputs = [ 8 rsync