JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rsync: 3.2.4 -> 3.2.5

Browse Source 
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
This commit is contained in:
Ivan Kozik 2022-08-20 03:51:09 +00:00 committed by ehmry
parent 4cff5cf6ba
commit 457e267206
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/networking/sync/rsync/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch
, perl , perl
, libiconv , libiconv
, zlib , zlib
@ -16,27 +15,18 @@
, xxHash , xxHash
, enableZstd ? true , enableZstd ? true
, zstd , zstd
, enableCopyDevicesPatch ? false
, nixosTests , nixosTests
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rsync"; pname = "rsync";
version = "3.2.4"; version = "3.2.5";
srcs = [ src = fetchurl {
(fetchurl {
# signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
sha256 = "sha256-b3YYONCAUrC2V5z39nN9k+R/AfTaBMXSTTRHt/Kl+tE=";
})
] ++ lib.optional enableCopyDevicesPatch (fetchurl {
# signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
sha256 = "1wj21v57v135n6fnm2m2dxmb9lhrrg62jgkggldp1gb7d6s4arny"; sha256 = "sha256-KsTSFjXN95GGe8N3w1ym3af1DZGaWL5FBX/VFgDGmro=";
}); };
patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
@ -64,6 +54,6 @@ stdenv.mkDerivation rec {
homepage = "https://rsync.samba.org/"; homepage = "https://rsync.samba.org/";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with lib.maintainers; [ ehmry kampfschlaefer ]; maintainers = with lib.maintainers; [ ehmry kampfschlaefer ivan ];
}; };
} }

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

@ -2,7 +2,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "rrsync"; pname = "rrsync";
inherit (rsync) version srcs; inherit (rsync) version src;
buildInputs = [ buildInputs = [
rsync rsync