diff options
| author | Ivan Kozik <ivan@ludios.org> | 2022-08-20 03:51:09 +0000 |
|---|---|---|
| committer | ehmry <ehmry@posteo.net> | 2022-08-20 09:12:37 -0500 |
| commit | 457e2672066c8dc0df2df1a3193139c659581639 (patch) | |
| tree | c16c5ac426f14bb770ebbc6dc7558b744cc23de1 | |
| parent | 4cff5cf6ba205266c8df075c0f75e9635db389d6 (diff) | |
| download | nixpkgs-457e2672066c8dc0df2df1a3193139c659581639.tar nixpkgs-457e2672066c8dc0df2df1a3193139c659581639.tar.gz nixpkgs-457e2672066c8dc0df2df1a3193139c659581639.tar.bz2 nixpkgs-457e2672066c8dc0df2df1a3193139c659581639.tar.lz nixpkgs-457e2672066c8dc0df2df1a3193139c659581639.tar.xz nixpkgs-457e2672066c8dc0df2df1a3193139c659581639.tar.zst nixpkgs-457e2672066c8dc0df2df1a3193139c659581639.zip | |
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
| -rw-r--r-- | pkgs/applications/networking/sync/rsync/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/applications/networking/sync/rsync/rrsync.nix | 2 |
2 files changed, 7 insertions, 17 deletions
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 5e0ddc69a46..bdddfe4f867 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , perl , libiconv , zlib @@ -16,27 +15,18 @@ , xxHash , enableZstd ? true , zstd -, enableCopyDevicesPatch ? false , nixosTests }: stdenv.mkDerivation rec { pname = "rsync"; - version = "3.2.4"; + version = "3.2.5"; - srcs = [ - (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 { + src = fetchurl { # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 - url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; - sha256 = "1wj21v57v135n6fnm2m2dxmb9lhrrg62jgkggldp1gb7d6s4arny"; - }); - - patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; + url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; + sha256 = "sha256-KsTSFjXN95GGe8N3w1ym3af1DZGaWL5FBX/VFgDGmro="; + }; nativeBuildInputs = [ perl ]; @@ -64,6 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://rsync.samba.org/"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with lib.maintainers; [ ehmry kampfschlaefer ]; + maintainers = with lib.maintainers; [ ehmry kampfschlaefer ivan ]; }; } diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index c18f454d87c..09f9ab22f33 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "rrsync"; - inherit (rsync) version srcs; + inherit (rsync) version src; buildInputs = [ rsync |