From 46b2056c2ecb9665fa28417dbd19a38b4dece00a Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Jan 29 2018 09:02:44 +0000 Subject: new version 3.1.3 Resolves CVE-2018-5764 --- diff --git a/.gitignore b/.gitignore index 7d71324..9c4fe93 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ rsync-patches-3.0.8.tar.gz /rsync-patches-3.1.0.tar.gz /rsync-3.1.2.tar.gz /rsync-patches-3.1.2.tar.gz +/rsync-3.1.3.tar.gz +/rsync-patches-3.1.3.tar.gz diff --git a/rsync-noatime.patch b/rsync-noatime.patch index 33312cf..9ca27a8 100644 --- a/rsync-noatime.patch +++ b/rsync-noatime.patch @@ -69,18 +69,18 @@ Index: rsync-3.1.0/rsync.yo dit(bf(-4, --ipv4) or bf(-6, --ipv6)) Tells rsync to prefer IPv4/IPv6 when creating sockets. This only affects sockets that rsync has direct control over, such as the outgoing socket when directly contacting an -Index: rsync-3.1.0/syscall.c -=================================================================== ---- rsync-3.1.0.orig/syscall.c -+++ rsync-3.1.0/syscall.c -@@ -40,6 +40,7 @@ extern int read_only; - extern int list_only; +diff --git a/syscall.c b/syscall.c +index c46a8b4..6620563 100644 +--- a/syscall.c ++++ b/syscall.c +@@ -42,6 +42,7 @@ extern int inplace; + extern int preallocate_files; extern int preserve_perms; extern int preserve_executability; +extern int noatime; - #define RETURN_ERROR_IF(x,e) \ - do { \ + #ifndef S_BLKSIZE + # if defined hpux || defined __hpux__ || defined __hpux @@ -189,6 +190,10 @@ int do_open(const char *pathname, int fl RETURN_ERROR_IF(dry_run, 0); RETURN_ERROR_IF_RO_OR_LO; diff --git a/rsync.spec b/rsync.spec index d6d25b3..2cf58b8 100644 --- a/rsync.spec +++ b/rsync.spec @@ -8,8 +8,8 @@ Summary: A program for synchronizing files over a network Name: rsync -Version: 3.1.2 -Release: 7%{?dist} +Version: 3.1.3 +Release: 1%{?dist} Group: Applications/Internet URL: http://rsync.samba.org/ @@ -120,6 +120,10 @@ rm -rf $RPM_BUILD_ROOT %systemd_postun_with_restart rsyncd.service %changelog +* Mon Jan 29 2018 Michal Ruprich - 3.1.3-1 +- new version 3.1.3 +- Resolves CVE-2018-5764 + * Thu Aug 03 2017 Fedora Release Engineering - 3.1.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index ab022cd..506823e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -0f758d7e000c0f7f7d3792610fad70cb rsync-3.1.2.tar.gz -f412602a3cba0b872adfaed905a0aa28 rsync-patches-3.1.2.tar.gz +SHA512 (rsync-3.1.3.tar.gz) = 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99 +SHA512 (rsync-patches-3.1.3.tar.gz) = eb0762faa8a2c170986e7e94a75f5dbe8fdb86b980bacc60e92df2c60e6340fdafa5256d67284d52ac32e097663c596533007db91d2b3ec6088a381cb229dc9f