From cc1ea5bd5a8b204a2b9c8b3551da0c243db04e66 Mon Sep 17 00:00:00 2001
From: Michal Luscon <mluscon@redhat.com>
Date: Jun 17 2013 13:19:42 +0000
Subject: Fixed: #947765 - rsync daemon chooses wrong destination place


---

diff --git a/rsync-3.1.0-protect_args.patch b/rsync-3.1.0-protect_args.patch
new file mode 100644
index 0000000..5fb722a
--- /dev/null
+++ b/rsync-3.1.0-protect_args.patch
@@ -0,0 +1,22 @@
+--- ./util.c	2011-04-23 00:51:55.000000000 +0200
++++ ./util.c	2013-06-14 15:10:21.381102268 +0200
+@@ -25,6 +25,7 @@
+ 
+ extern int verbose;
+ extern int module_id;
++extern int protect_args;
+ extern int modify_window;
+ extern int relative_paths;
+ extern int preserve_times;
+@@ -719,6 +720,11 @@
+ 	if (strncmp(arg, base, base_len) == 0)
+ 		arg += base_len;
+ 
++        if (protect_args) {
++               glob_expand(arg, argv_p, argc_p, maxargs_p);
++               return;
++        }
++        
+ 	if (!(arg = strdup(arg)))
+ 		out_of_memory("glob_expand_module");
+ 
diff --git a/rsync.spec b/rsync.spec
index aa5e211..1039471 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -7,7 +7,7 @@
 Summary: A program for synchronizing files over a network
 Name: rsync
 Version: 3.0.9
-Release: 9%{?prerelease}%{?dist}
+Release: 10%{?prerelease}%{?dist}
 Group: Applications/Internet
 URL: http://rsync.samba.org/
 
@@ -26,6 +26,7 @@ License: GPLv3+
 
 Patch0: rsync-3.0.10-lose-track.patch
 Patch1: rsync-man.patch
+Patch2: rsync-3.1.0-protect_args.patch
 
 %description
 Rsync uses a reliable algorithm to bring remote and host files into
@@ -58,6 +59,7 @@ patch -p1 -i patches/copy-devices.diff
 
 %patch0 -p1 -b .lose-track
 %patch1 -p1 -b .man
+%patch2 -p1 -b .protect_args
 
 %build
 rm -fr autom4te.cache
@@ -103,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %systemd_postun_with_restart rsyncd.service
 
 %changelog
+* Mon Jun 17 2013 Michal Luscon <mluscon@redhat.com> - 3.0.9-10
+- Fixed: #947765 - rsync daemon chooses wrong destination place
+
 * Fri May 17 2013 Michal Luscon <mluscon@redhat.com> - 3.0.9-9
 - Fix missing man page and help options