@@ -1,12 +0,0 @@
|
|||||||
diff -rup rsync-3.2.7/configure.sh rsync-3.2.7-fixed/configure.sh
|
|
||||||
--- rsync-3.2.7/configure.sh 2022-10-20 17:57:22
|
|
||||||
+++ rsync-3.2.7-fixed/configure.sh 2024-01-01 19:51:58
|
|
||||||
@@ -7706,7 +7706,7 @@ else $as_nop
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
-main()
|
|
||||||
+int main()
|
|
||||||
{
|
|
||||||
if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
|
|
||||||
exit(1);
|
|
||||||
@@ -22,22 +22,18 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "rsync";
|
pname = "rsync";
|
||||||
version = "3.3.0";
|
version = "3.4.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
# signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
|
# signed with key 9FEF 112D CE19 A0DC 7E88 2CB8 1BB2 4997 A853 5F6F
|
||||||
url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
|
url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
|
||||||
hash = "sha256-c5nppnCMMtZ4pypjIZ6W8jvgviM25Q/RNISY0HBB35A=";
|
hash = "sha256-KSS8s6Hti1UfwQH3QLnw/gogKxFQJ2R89phQ1l/YjFI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
updateAutotoolsGnuConfigScriptsHook
|
updateAutotoolsGnuConfigScriptsHook
|
||||||
perl
|
perl
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
|
||||||
# https://github.com/WayneD/rsync/pull/558
|
|
||||||
./configure.ac-fix-failing-IPv6-check.patch
|
|
||||||
./CVE-2024-12084/0001-Some-checksum-buffer-fixes.patch
|
./CVE-2024-12084/0001-Some-checksum-buffer-fixes.patch
|
||||||
./CVE-2024-12084/0002-Another-cast-when-multiplying-integers.patch
|
./CVE-2024-12084/0002-Another-cast-when-multiplying-integers.patch
|
||||||
./CVE-2024-12085/0001-prevent-information-leak-off-the-stack.patch
|
./CVE-2024-12085/0001-prevent-information-leak-off-the-stack.patch
|
||||||
@@ -50,7 +46,6 @@ stdenv.mkDerivation rec {
|
|||||||
./CVE-2024-12088/0001-make-safe-links-stricter.patch
|
./CVE-2024-12088/0001-make-safe-links-stricter.patch
|
||||||
./CVE-2024-12747/0001-fixed-symlink-race-condition-in-sender.patch
|
./CVE-2024-12747/0001-fixed-symlink-race-condition-in-sender.patch
|
||||||
./raise-protocol-version-to-32.patch
|
./raise-protocol-version-to-32.patch
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[
|
[
|
||||||
|
|||||||
Reference in New Issue
Block a user